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
|
|
From: <be...@us...> - 2012-06-26 17:34:09
|
Revision: 9727
http://xoops.svn.sourceforge.net/xoops/?rev=9727&view=rev
Author: beckmi
Date: 2012-06-26 17:34:02 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
adding default strings for localization (cesag)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php
XoopsModules/xforms/branches/mamba/xforms/admin/main.php
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
XoopsModules/xforms/trunk/xforms/admin/default_elements.php
XoopsModules/xforms/trunk/xforms/admin/main.php
XoopsModules/xforms/trunk/xforms/docs/changelog.txt
XoopsModules/xforms/trunk/xforms/language/english/admin.php
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -5,7 +5,7 @@
if( !defined('xforms_ROOT_PATH') ){ exit(); }
$defaults = array();
-$defaults[0]['caption'] = 'Your name';
+$defaults[0]['caption'] = _AM_ELE_YOUR_NAME;
$defaults[0]['req'] = true;
$defaults[0]['order'] = 1;
$defaults[0]['display'] = 1;
@@ -16,7 +16,7 @@
2 => '{UNAME}'
);
-$defaults[1]['caption'] = 'Email address';
+$defaults[1]['caption'] = _AM_ELE_YOUR_EMAIL;
$defaults[1]['req'] = true;
$defaults[1]['order'] = 2;
$defaults[1]['display'] = 1;
@@ -27,7 +27,7 @@
2 => '{EMAIL}'
);
-$defaults[2]['caption'] = 'Your comments';
+$defaults[2]['caption'] = _AM_ELE_YOUR_COMMENTS;
$defaults[2]['req'] = true;
$defaults[2]['order'] = 3;
$defaults[2]['display'] = 1;
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/main.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -12,7 +12,13 @@
default:
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('main.php') ;
+ echo $indexAdmin->addNavigation('main.php') ;
+
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU2, 'main.php?op=edit', 'add', '');
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU3, 'editelement.php', 'add', '');
+ echo $indexAdmin->renderButton('right', '');
+
+
$criteria = new Criteria(1, 1);
$criteria->setSort('form_order');
$criteria->setOrder('ASC');
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 17:34:02 UTC (rev 9727)
@@ -2,6 +2,7 @@
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
+- adding default strings for localization (cesag)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -110,4 +110,9 @@
define('_AM_XFORMS_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
// Text for Admin footer
-//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+
+//xForms 1.21 Defaults
+define("_AM_ELE_YOUR_NAME",'Your Name');
+define("_AM_ELE_YOUR_EMAIL",'Email address');
+define("_AM_ELE_YOUR_COMMENTS",'Your comments');
Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -20,7 +20,7 @@
//about
$modversion['release_date'] = '2012/06/25';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["module_status"] = "Final";
$modversion['min_php']='5.2';
Modified: XoopsModules/xforms/trunk/xforms/admin/default_elements.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/default_elements.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/admin/default_elements.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -5,7 +5,7 @@
if( !defined('xforms_ROOT_PATH') ){ exit(); }
$defaults = array();
-$defaults[0]['caption'] = 'Your name';
+$defaults[0]['caption'] = _AM_ELE_YOUR_NAME;
$defaults[0]['req'] = true;
$defaults[0]['order'] = 1;
$defaults[0]['display'] = 1;
@@ -16,7 +16,7 @@
2 => '{UNAME}'
);
-$defaults[1]['caption'] = 'Email address';
+$defaults[1]['caption'] = _AM_ELE_YOUR_EMAIL;
$defaults[1]['req'] = true;
$defaults[1]['order'] = 2;
$defaults[1]['display'] = 1;
@@ -27,7 +27,7 @@
2 => '{EMAIL}'
);
-$defaults[2]['caption'] = 'Your comments';
+$defaults[2]['caption'] = _AM_ELE_YOUR_COMMENTS;
$defaults[2]['req'] = true;
$defaults[2]['order'] = 3;
$defaults[2]['display'] = 1;
Modified: XoopsModules/xforms/trunk/xforms/admin/main.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/main.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/admin/main.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -12,7 +12,13 @@
default:
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('main.php') ;
+ echo $indexAdmin->addNavigation('main.php') ;
+
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU2, 'main.php?op=edit', 'add', '');
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU3, 'editelement.php', 'add', '');
+ echo $indexAdmin->renderButton('right', '');
+
+
$criteria = new Criteria(1, 1);
$criteria->setSort('form_order');
$criteria->setOrder('ASC');
Modified: XoopsModules/xforms/trunk/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 17:34:02 UTC (rev 9727)
@@ -2,6 +2,7 @@
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
+- adding default strings for localization (cesag)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/trunk/xforms/language/english/admin.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/language/english/admin.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/language/english/admin.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -110,4 +110,9 @@
define('_AM_XFORMS_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
// Text for Admin footer
-//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+
+//xForms 1.21 Defaults
+define("_AM_ELE_YOUR_NAME",'Your Name');
+define("_AM_ELE_YOUR_EMAIL",'Email address');
+define("_AM_ELE_YOUR_COMMENTS",'Your comments');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-26 14:18:55
|
Revision: 9726
http://xoops.svn.sourceforge.net/xoops/?rev=9726&view=rev
Author: txmodxoops
Date: 2012-06-26 14:18:44 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
fixed bug float
Modified Paths:
--------------
XoopsModules/addresses/branches/timgno/addresses/sql/mysql.sql
Modified: XoopsModules/addresses/branches/timgno/addresses/sql/mysql.sql
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/sql/mysql.sql 2012-06-26 14:11:03 UTC (rev 9725)
+++ XoopsModules/addresses/branches/timgno/addresses/sql/mysql.sql 2012-06-26 14:18:44 UTC (rev 9726)
@@ -1,13 +1,13 @@
-
+
#
# Table structure for table `addresses_broken` 4
#
CREATE TABLE `addresses_broken` (
-`broken_id` int (8) unsigned NOT NULL auto_increment,
+`broken_id` int (8) unsigned NOT NULL auto_increment,
`broken_aid` int (11) unsigned NOT NULL default '0',
`broken_sender` int (11) unsigned NOT NULL default '0',
-`broken_ip` varchar (20) NOT NULL default ' ',
+`broken_ip` varchar (20) NOT NULL default ' ',
PRIMARY KEY (`broken_id`),
KEY `broken_aid` (`broken_aid`),
KEY `broken_sender` (`broken_sender`),
@@ -18,11 +18,11 @@
#
CREATE TABLE `addresses_cat` (
-`cat_id` int (8) unsigned NOT NULL auto_increment,
+`cat_id` int (8) unsigned NOT NULL auto_increment,
`cat_pid` int (5) unsigned NOT NULL default '0',
-`cat_title` varchar (50) NOT NULL default ' ',
-`cat_description` text NOT NULL ,
-`cat_imgurl` varchar (150) NOT NULL default ' ',
+`cat_title` varchar (50) NOT NULL default ' ',
+`cat_description` text NOT NULL ,
+`cat_imgurl` varchar (150) NOT NULL default ' ',
`cat_show_map` tinyint (1) unsigned NOT NULL default '0',
PRIMARY KEY (`cat_id`),
KEY `cat_pid` (`cat_pid`)
@@ -32,29 +32,29 @@
#
CREATE TABLE `addresses_addr` (
-`addr_id` int (8) unsigned NOT NULL auto_increment,
+`addr_id` int (8) unsigned NOT NULL auto_increment,
`addr_cid` int (5) unsigned NOT NULL default '0',
-`addr_title` varchar (100) NOT NULL default ' ',
-`addr_description` text NOT NULL ,
-`addr_url` varchar (250) NOT NULL default ' ',
-`addr_address` varchar (100) NOT NULL default ' ',
-`addr_zip` varchar (20) NOT NULL default ' ',
-`addr_city` varchar (100) NOT NULL default ' ',
-`addr_country` varchar (100) NOT NULL default ' ',
-`addr_long` float ( ) NOT NULL default '0.0000',
-`addr_lat` float ( ) NOT NULL default '0.0000',
+`addr_title` varchar (100) NOT NULL default ' ',
+`addr_description` text NOT NULL ,
+`addr_url` varchar (250) NOT NULL default ' ',
+`addr_address` varchar (100) NOT NULL default ' ',
+`addr_zip` varchar (20) NOT NULL default ' ',
+`addr_city` varchar (100) NOT NULL default ' ',
+`addr_country` varchar (100) NOT NULL default ' ',
+`addr_long` float NOT NULL default '0.0000',
+`addr_lat` float NOT NULL default '0.0000',
`addr_zoom` tinyint (2) unsigned NOT NULL default '0',
-`addr_phone` varchar (40) NOT NULL default ' ',
-`addr_mobile` varchar (40) NOT NULL default ' ',
-`addr_fax` varchar (40) NOT NULL default ' ',
-`addr_contemail` varchar (100) NOT NULL default ' ',
-`addr_opentime` text NOT NULL ,
-`addr_logourl` varchar (150) NOT NULL default ' ',
+`addr_phone` varchar (40) NOT NULL default ' ',
+`addr_mobile` varchar (40) NOT NULL default ' ',
+`addr_fax` varchar (40) NOT NULL default ' ',
+`addr_contemail` varchar (100) NOT NULL default ' ',
+`addr_opentime` text NOT NULL ,
+`addr_logourl` varchar (150) NOT NULL default ' ',
`addr_submitter` int (11) unsigned NOT NULL default '0',
`addr_status` tinyint (2) unsigned NOT NULL default '0',
`addr_date` int (10) unsigned NOT NULL default '0',
`addr_hits` int (11) unsigned NOT NULL default '0',
-`addr_rating` double (6,4) NOT NULL default '0.0000',
+`addr_rating` double (6,4) NOT NULL default '0.0000',
`addr_votes` int (11) unsigned NOT NULL default '0',
`addr_comments` int (11) unsigned NOT NULL default '0',
PRIMARY KEY (`addr_id`),
@@ -66,11 +66,11 @@
#
CREATE TABLE `addresses_votedata` (
-`votedata_rid` int (8) unsigned NOT NULL auto_increment,
+`votedata_rid` int (8) unsigned NOT NULL auto_increment,
`votedata_aid` int (5) unsigned NOT NULL default '0',
`votedata_ruser` int (11) unsigned NOT NULL default '0',
`votedata_rating` tinyint (3) unsigned NOT NULL default '0',
-`votedata_rhostname` varchar (60) NOT NULL default ' ',
+`votedata_rhostname` varchar (60) NOT NULL default ' ',
`votedata_rtimestamp` int (10) unsigned NOT NULL default '0',
PRIMARY KEY (`votedata_rid`),
KEY `votedata_ruser` (`votedata_ruser`),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-06-26 14:11:18
|
Revision: 9725
http://xoops.svn.sourceforge.net/xoops/?rev=9725&view=rev
Author: txmodxoops
Date: 2012-06-26 14:11:03 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Added new versione 1.73 beta 1
Added Paths:
-----------
XoopsModules/addresses/
XoopsModules/addresses/branches/
XoopsModules/addresses/branches/timgno/
XoopsModules/addresses/branches/timgno/addresses/
XoopsModules/addresses/branches/timgno/addresses/addr.php
XoopsModules/addresses/branches/timgno/addresses/admin/
XoopsModules/addresses/branches/timgno/addresses/admin/about.php
XoopsModules/addresses/branches/timgno/addresses/admin/addr.php
XoopsModules/addresses/branches/timgno/addresses/admin/admin_footer.php
XoopsModules/addresses/branches/timgno/addresses/admin/admin_header.php
XoopsModules/addresses/branches/timgno/addresses/admin/broken.php
XoopsModules/addresses/branches/timgno/addresses/admin/cat.php
XoopsModules/addresses/branches/timgno/addresses/admin/index.html
XoopsModules/addresses/branches/timgno/addresses/admin/index.php
XoopsModules/addresses/branches/timgno/addresses/admin/menu.php
XoopsModules/addresses/branches/timgno/addresses/admin/votedata.php
XoopsModules/addresses/branches/timgno/addresses/blocks/
XoopsModules/addresses/branches/timgno/addresses/blocks/blocks_addr.php
XoopsModules/addresses/branches/timgno/addresses/blocks/blocks_broken.php
XoopsModules/addresses/branches/timgno/addresses/blocks/blocks_cat.php
XoopsModules/addresses/branches/timgno/addresses/blocks/blocks_votedata.php
XoopsModules/addresses/branches/timgno/addresses/blocks/index.html
XoopsModules/addresses/branches/timgno/addresses/broken.php
XoopsModules/addresses/branches/timgno/addresses/cat.php
XoopsModules/addresses/branches/timgno/addresses/class/
XoopsModules/addresses/branches/timgno/addresses/class/addresses_addr.php
XoopsModules/addresses/branches/timgno/addresses/class/addresses_broken.php
XoopsModules/addresses/branches/timgno/addresses/class/addresses_cat.php
XoopsModules/addresses/branches/timgno/addresses/class/addresses_votedata.php
XoopsModules/addresses/branches/timgno/addresses/class/index.html
XoopsModules/addresses/branches/timgno/addresses/css/
XoopsModules/addresses/branches/timgno/addresses/css/index.html
XoopsModules/addresses/branches/timgno/addresses/docs/
XoopsModules/addresses/branches/timgno/addresses/docs/changelog.txt
XoopsModules/addresses/branches/timgno/addresses/docs/credits.txt
XoopsModules/addresses/branches/timgno/addresses/docs/index.html
XoopsModules/addresses/branches/timgno/addresses/docs/install.txt
XoopsModules/addresses/branches/timgno/addresses/docs/lang_diff.txt
XoopsModules/addresses/branches/timgno/addresses/docs/licence.txt
XoopsModules/addresses/branches/timgno/addresses/docs/readme.txt
XoopsModules/addresses/branches/timgno/addresses/header.php
XoopsModules/addresses/branches/timgno/addresses/images/
XoopsModules/addresses/branches/timgno/addresses/images/32/
XoopsModules/addresses/branches/timgno/addresses/images/32/addresses_add.png
XoopsModules/addresses/branches/timgno/addresses/images/32/addresses_broken.png
XoopsModules/addresses/branches/timgno/addresses/images/32/addresses_cat.png
XoopsModules/addresses/branches/timgno/addresses/images/32/addresses_stats.png
XoopsModules/addresses/branches/timgno/addresses/images/32/index.html
XoopsModules/addresses/branches/timgno/addresses/images/addresses_slogo.png
XoopsModules/addresses/branches/timgno/addresses/images/icons/
XoopsModules/addresses/branches/timgno/addresses/images/icons/index.html
XoopsModules/addresses/branches/timgno/addresses/images/icons/off.png
XoopsModules/addresses/branches/timgno/addresses/images/icons/on.png
XoopsModules/addresses/branches/timgno/addresses/images/index.html
XoopsModules/addresses/branches/timgno/addresses/images/menu/
XoopsModules/addresses/branches/timgno/addresses/images/menu/bg.png
XoopsModules/addresses/branches/timgno/addresses/images/menu/index.html
XoopsModules/addresses/branches/timgno/addresses/images/menu/left_both.png
XoopsModules/addresses/branches/timgno/addresses/images/menu/right_both.png
XoopsModules/addresses/branches/timgno/addresses/include/
XoopsModules/addresses/branches/timgno/addresses/include/config.php
XoopsModules/addresses/branches/timgno/addresses/include/functions.php
XoopsModules/addresses/branches/timgno/addresses/include/index.html
XoopsModules/addresses/branches/timgno/addresses/include/install.php
XoopsModules/addresses/branches/timgno/addresses/index.php
XoopsModules/addresses/branches/timgno/addresses/language/
XoopsModules/addresses/branches/timgno/addresses/language/index.html
XoopsModules/addresses/branches/timgno/addresses/language/italian/
XoopsModules/addresses/branches/timgno/addresses/language/italian/admin.php
XoopsModules/addresses/branches/timgno/addresses/language/italian/blocks.php
XoopsModules/addresses/branches/timgno/addresses/language/italian/help/
XoopsModules/addresses/branches/timgno/addresses/language/italian/help/help.html
XoopsModules/addresses/branches/timgno/addresses/language/italian/help/index.html
XoopsModules/addresses/branches/timgno/addresses/language/italian/index.html
XoopsModules/addresses/branches/timgno/addresses/language/italian/main.php
XoopsModules/addresses/branches/timgno/addresses/language/italian/modinfo.php
XoopsModules/addresses/branches/timgno/addresses/sql/
XoopsModules/addresses/branches/timgno/addresses/sql/index.html
XoopsModules/addresses/branches/timgno/addresses/sql/mysql.sql
XoopsModules/addresses/branches/timgno/addresses/templates/
XoopsModules/addresses/branches/timgno/addresses/templates/addresses_addr.html
XoopsModules/addresses/branches/timgno/addresses/templates/addresses_broken.html
XoopsModules/addresses/branches/timgno/addresses/templates/addresses_cat.html
XoopsModules/addresses/branches/timgno/addresses/templates/addresses_footer.html
XoopsModules/addresses/branches/timgno/addresses/templates/addresses_header.html
XoopsModules/addresses/branches/timgno/addresses/templates/addresses_index.html
XoopsModules/addresses/branches/timgno/addresses/templates/addresses_votedata.html
XoopsModules/addresses/branches/timgno/addresses/templates/admin/
XoopsModules/addresses/branches/timgno/addresses/templates/admin/addresses_admin_about.html
XoopsModules/addresses/branches/timgno/addresses/templates/admin/addresses_admin_help.html
XoopsModules/addresses/branches/timgno/addresses/templates/admin/index.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_addr_block_day.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_addr_block_random.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_addr_block_recent.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_broken_block_day.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_broken_block_random.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_broken_block_recent.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_cat_block_day.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_cat_block_random.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_cat_block_recent.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_votedata_block_day.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_votedata_block_random.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/addresses_votedata_block_recent.html
XoopsModules/addresses/branches/timgno/addresses/templates/blocks/index.html
XoopsModules/addresses/branches/timgno/addresses/templates/index.html
XoopsModules/addresses/branches/timgno/addresses/votedata.php
XoopsModules/addresses/branches/timgno/addresses/xoops_version.php
XoopsModules/addresses/releases/
XoopsModules/addresses/trunk/
XoopsModules/addresses/trunk/addresses/
XoopsModules/addresses/trunk/addresses/CHANGES+HACK.txt
XoopsModules/addresses/trunk/addresses/address_broken.php
XoopsModules/addresses/trunk/addresses/address_mod.php
XoopsModules/addresses/trunk/addresses/address_print.php
XoopsModules/addresses/trunk/addresses/address_rate.php
XoopsModules/addresses/trunk/addresses/address_single.php
XoopsModules/addresses/trunk/addresses/address_submit.php
XoopsModules/addresses/trunk/addresses/address_visit.php
XoopsModules/addresses/trunk/addresses/addresses_google_maps.php
XoopsModules/addresses/trunk/addresses/admin/
XoopsModules/addresses/trunk/addresses/admin/functions.php
XoopsModules/addresses/trunk/addresses/admin/index.php
XoopsModules/addresses/trunk/addresses/admin/menu.php
XoopsModules/addresses/trunk/addresses/blocks/
XoopsModules/addresses/trunk/addresses/blocks/addresses_categories.php
XoopsModules/addresses/trunk/addresses/blocks/addresses_top.php
XoopsModules/addresses/trunk/addresses/blocks/index.html
XoopsModules/addresses/trunk/addresses/cat_view.php
XoopsModules/addresses/trunk/addresses/class.in_progress/
XoopsModules/addresses/trunk/addresses/class.in_progress/address.php
XoopsModules/addresses/trunk/addresses/class.in_progress/category.php
XoopsModules/addresses/trunk/addresses/comment_delete.php
XoopsModules/addresses/trunk/addresses/comment_edit.php
XoopsModules/addresses/trunk/addresses/comment_new.php
XoopsModules/addresses/trunk/addresses/comment_post.php
XoopsModules/addresses/trunk/addresses/comment_reply.php
XoopsModules/addresses/trunk/addresses/config.php
XoopsModules/addresses/trunk/addresses/google_maps_popup.php
XoopsModules/addresses/trunk/addresses/header.php
XoopsModules/addresses/trunk/addresses/images/
XoopsModules/addresses/trunk/addresses/images/MapIt.gif
XoopsModules/addresses/trunk/addresses/images/addresses_slogo.png
XoopsModules/addresses/trunk/addresses/images/arrow.gif
XoopsModules/addresses/trunk/addresses/images/bg.png
XoopsModules/addresses/trunk/addresses/images/button_edit.png
XoopsModules/addresses/trunk/addresses/images/close12.gif
XoopsModules/addresses/trunk/addresses/images/down.gif
XoopsModules/addresses/trunk/addresses/images/editicon.gif
XoopsModules/addresses/trunk/addresses/images/editicon.org.gif
XoopsModules/addresses/trunk/addresses/images/home.gif
XoopsModules/addresses/trunk/addresses/images/index.html
XoopsModules/addresses/trunk/addresses/images/left_both.png
XoopsModules/addresses/trunk/addresses/images/link.gif
XoopsModules/addresses/trunk/addresses/images/loading.gif
XoopsModules/addresses/trunk/addresses/images/logo.gif
XoopsModules/addresses/trunk/addresses/images/map.gif
XoopsModules/addresses/trunk/addresses/images/mm_20_black.png
XoopsModules/addresses/trunk/addresses/images/mm_20_blue.png
XoopsModules/addresses/trunk/addresses/images/mm_20_gray.png
XoopsModules/addresses/trunk/addresses/images/mm_20_green.png
XoopsModules/addresses/trunk/addresses/images/mm_20_red.png
XoopsModules/addresses/trunk/addresses/images/mm_20_shadow.png
XoopsModules/addresses/trunk/addresses/images/mm_20_white.png
XoopsModules/addresses/trunk/addresses/images/mm_20_yellow.png
XoopsModules/addresses/trunk/addresses/images/newred.gif
XoopsModules/addresses/trunk/addresses/images/open12.gif
XoopsModules/addresses/trunk/addresses/images/pop.gif
XoopsModules/addresses/trunk/addresses/images/right_both.png
XoopsModules/addresses/trunk/addresses/images/shots/
XoopsModules/addresses/trunk/addresses/images/shots/01banner.jpg
XoopsModules/addresses/trunk/addresses/images/shots/index.html
XoopsModules/addresses/trunk/addresses/images/up.gif
XoopsModules/addresses/trunk/addresses/images/update.gif
XoopsModules/addresses/trunk/addresses/include/
XoopsModules/addresses/trunk/addresses/include/comment_functions.php
XoopsModules/addresses/trunk/addresses/include/functions.php
XoopsModules/addresses/trunk/addresses/include/index.html
XoopsModules/addresses/trunk/addresses/include/notification.inc.php
XoopsModules/addresses/trunk/addresses/include/search.inc.php
XoopsModules/addresses/trunk/addresses/index.php
XoopsModules/addresses/trunk/addresses/language/
XoopsModules/addresses/trunk/addresses/language/english/
XoopsModules/addresses/trunk/addresses/language/english/admin.php
XoopsModules/addresses/trunk/addresses/language/english/blocks.php
XoopsModules/addresses/trunk/addresses/language/english/index.html
XoopsModules/addresses/trunk/addresses/language/english/mail_template/
XoopsModules/addresses/trunk/addresses/language/english/mail_template/category_linksubmit_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/mail_template/category_newlink_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/mail_template/global_linkbroken_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/mail_template/global_linkmodify_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/mail_template/global_linksubmit_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/mail_template/global_newcategory_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/mail_template/global_newlink_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/mail_template/link_approve_notify.tpl
XoopsModules/addresses/trunk/addresses/language/english/main.php
XoopsModules/addresses/trunk/addresses/language/english/modinfo.php
XoopsModules/addresses/trunk/addresses/language/index.html
XoopsModules/addresses/trunk/addresses/language/italian/
XoopsModules/addresses/trunk/addresses/language/italian/admin.php
XoopsModules/addresses/trunk/addresses/language/italian/blocks.php
XoopsModules/addresses/trunk/addresses/language/italian/index.html
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/category_linksubmit_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/category_newlink_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/global_linkbroken_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/global_linkmodify_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/global_linksubmit_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/global_newcategory_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/global_newlink_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/mail_template/link_approve_notify.tpl
XoopsModules/addresses/trunk/addresses/language/italian/main.php
XoopsModules/addresses/trunk/addresses/language/italian/modinfo.php
XoopsModules/addresses/trunk/addresses/myheader.php
XoopsModules/addresses/trunk/addresses/notification_update.php
XoopsModules/addresses/trunk/addresses/sql/
XoopsModules/addresses/trunk/addresses/sql/index.html
XoopsModules/addresses/trunk/addresses/sql/mysql.sql
XoopsModules/addresses/trunk/addresses/templates/
XoopsModules/addresses/trunk/addresses/templates/addresses_address.html
XoopsModules/addresses/trunk/addresses/templates/addresses_brokenaddress.html
XoopsModules/addresses/trunk/addresses/templates/addresses_google_maps.html
XoopsModules/addresses/trunk/addresses/templates/addresses_index.html
XoopsModules/addresses/trunk/addresses/templates/addresses_javascript.js
XoopsModules/addresses/trunk/addresses/templates/addresses_link.html
XoopsModules/addresses/trunk/addresses/templates/addresses_modaddress.html
XoopsModules/addresses/trunk/addresses/templates/addresses_print.html
XoopsModules/addresses/trunk/addresses/templates/addresses_rateaddress.html
XoopsModules/addresses/trunk/addresses/templates/addresses_singleaddress.html
XoopsModules/addresses/trunk/addresses/templates/addresses_submit.html
XoopsModules/addresses/trunk/addresses/templates/addresses_topten.html
XoopsModules/addresses/trunk/addresses/templates/addresses_viewaddress.html
XoopsModules/addresses/trunk/addresses/templates/addresses_viewcat.html
XoopsModules/addresses/trunk/addresses/templates/addresses_visitaddress.html
XoopsModules/addresses/trunk/addresses/templates/blocks/
XoopsModules/addresses/trunk/addresses/templates/blocks/addresses_block_categories.html
XoopsModules/addresses/trunk/addresses/templates/blocks/addresses_block_new.html
XoopsModules/addresses/trunk/addresses/templates/blocks/addresses_block_top.html
XoopsModules/addresses/trunk/addresses/templates/blocks/index.html
XoopsModules/addresses/trunk/addresses/templates/index.html
XoopsModules/addresses/trunk/addresses/test.php
XoopsModules/addresses/trunk/addresses/topten.php
XoopsModules/addresses/trunk/addresses/xoops_version.php
Property changes on: XoopsModules/addresses/branches
___________________________________________________________________
Added: svn:ignore
+ timgno
Added: XoopsModules/addresses/branches/timgno/addresses/addr.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/addr.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/addr.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+
+include_once "header.php";
+$xoopsOption['template_main'] = 'addresses_addr.html';
+include_once XOOPS_ROOT_PATH."/header.php";
+//keywords
+xoops_meta_keywords($GLOBALS['xoopsModuleConfig']['keywords']);
+//description
+xoops_meta_description(_MD_ADDRESSES_DESC);
+//
+$xoopsTpl->assign('xoops_mpageurl', ADDRESSES_URL."/addr.php");
+$xoopsTpl->assign('addresses_url', ADDRESSES_URL);
+$xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']);
+//
+$xoopsTpl->assign('barsocials', $GLOBALS['xoopsModuleConfig']['barsocials']);
+$xoopsTpl->assign('fbcomments', $GLOBALS['xoopsModuleConfig']['fbcomments']);
+//
+$xoopsTpl->assign('copyright', $mod_copyright);
+//
+include_once XOOPS_ROOT_PATH."/footer.php";
+?>
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/about.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/about.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/about.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,34 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+
+include "admin_header.php";
+echo $adminMenu->addNavigation("about.php");
+echo $adminMenu->renderabout('25J998Y3QEDZW', false);
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/addr.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/addr.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/addr.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,263 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+
+include "admin_header.php";
+//It recovered the value of argument op in URL$
+$op = addresses_CleanVars($_REQUEST, 'op', 'list', 'string');
+switch ($op)
+{
+ case "list":
+ default:
+ echo $adminMenu->addNavigation('addr.php');
+ $adminMenu->addItemButton(_AM_ADDRESSES_NEWADDR, 'addr.php?op=new_addr', 'add');
+ echo $adminMenu->renderButton();
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("addr_id");
+ $criteria->setOrder("ASC");
+ $numrows = $addrHandler->getCount();
+ $addr_arr = $addrHandler->getall($criteria);
+
+ //Affichage du tableau
+ if ($numrows>0)
+ {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._AM_ADDRESSES_ADDR_CID."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_TITLE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_URL."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_ADDRESS."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_ZIP."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_CITY."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_COUNTRY."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_LONG."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_LAT."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_ZOOM."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_PHONE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_MOBILE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_FAX."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_CONTEMAIL."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_OPENTIME."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_LOGOURL."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_SUBMITTER."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_STATUS."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_DATE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_HITS."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_RATING."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_VOTES."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_COMMENTS."</th>
+ <th align='center' width='10%'>"._AM_ADDRESSES_FORMACTION."</th>
+ </tr>";
+
+ $class = "odd";
+
+ foreach (array_keys($addr_arr) as $i)
+ {
+ echo "<tr class='".$class."'>";
+ $class = ($class == "even") ? "odd" : "even";
+ $cat =& $catHandler->get($addr_arr[$i]->getVar("addr_cid"));
+ $title_cat = $cat->getVar("cat_pid");
+ echo "<td class='center'>".$title_cat."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_title")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_description")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_url")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_address")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_zip")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_city")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_country")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_long")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_lat")."</td>";
+
+ $verif_addr_zoom = ( $addr_arr[$i]->getVar("addr_zoom") == 1 ) ? _YES : _NO;
+ echo "<td class='center'>".$verif_addr_zoom."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_phone")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_mobile")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_fax")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_contemail")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_opentime")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_logourl")."</td>";
+ echo "<td class='center'>".XoopsUser::getUnameFromId($addr_arr[$i]->getVar("addr_submitter"),"S")."</td>";
+
+ $verif_addr_status = ( $addr_arr[$i]->getVar("addr_status") == 1 ) ? _YES : _NO;
+ echo "<td class='center'>".$verif_addr_status."</td>";
+ echo "<td class='center'>".formatTimeStamp($addr_arr[$i]->getVar("addr_date"),"S")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_hits")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_rating")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_votes")."</td>";
+ echo "<td class='center'>".$addr_arr[$i]->getVar("addr_comments")."</td>";
+
+ echo "<td align='center' width='10%'>
+ <a href='addr.php?op=edit_addr&addr_id=".$addr_arr[$i]->getVar("addr_id")."'><img src=".$pathIcon16."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
+ <a href='addr.php?op=delete_addr&addr_id=".$addr_arr[$i]->getVar("addr_id")."'><img src=".$pathIcon16."/delete.png alt='"._DELETE."' title='"._DELETE."'></a>
+ </td>";
+ echo "</tr>";
+ }
+ echo "</table><br /><br />";
+ } else {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._AM_ADDRESSES_ADDR_CID."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_TITLE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_URL."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_ADDRESS."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_ZIP."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_CITY."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_COUNTRY."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_LONG."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_LAT."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_ZOOM."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_PHONE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_MOBILE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_FAX."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_CONTEMAIL."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_OPENTIME."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_LOGOURL."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_SUBMITTER."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_STATUS."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_DATE."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_HITS."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_RATING."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_VOTES."</th>
+ <th class='center'>"._AM_ADDRESSES_ADDR_COMMENTS."</th>
+ <th align='center' width='10%'>"._AM_ADDRESSES_FORMACTION."</th>
+ </tr><tr class='errorMsg'><td colspan='24'>No Address</td></tr>";
+ echo "</table><br /><br />";
+ }
+
+ break;
+
+ case "new_addr":
+ echo $adminMenu->addNavigation("addr.php");
+ $adminMenu->addItemButton(_AM_ADDRESSES_ADDRLIST, 'addr.php?op=list', 'list');
+ echo $adminMenu->renderButton();
+
+ $obj =& $addrHandler->create();
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+ case "save_addr":
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("addr.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if (isset($_REQUEST["addr_id"])) {
+ $obj =& $addrHandler->get($_REQUEST["addr_id"]);
+ } else {
+ $obj =& $addrHandler->create();
+ }
+
+ //Form addr_cid
+ $obj->setVar("addr_cid", $_REQUEST["addr_cid"]);
+ //Form addr_title
+ $obj->setVar("addr_title", $_REQUEST["addr_title"]);
+ //Form addr_description
+ $obj->setVar("addr_description", $_REQUEST["addr_description"]);
+ //Form addr_url
+ $obj->setVar("addr_url", $_REQUEST["addr_url"]);
+ //Form addr_address
+ $obj->setVar("addr_address", $_REQUEST["addr_address"]);
+ //Form addr_zip
+ $obj->setVar("addr_zip", $_REQUEST["addr_zip"]);
+ //Form addr_city
+ $obj->setVar("addr_city", $_REQUEST["addr_city"]);
+ //Form addr_country
+ $obj->setVar("addr_country", $_REQUEST["addr_country"]);
+ //Form addr_long
+ $obj->setVar("addr_long", $_REQUEST["addr_long"]);
+ //Form addr_lat
+ $obj->setVar("addr_lat", $_REQUEST["addr_lat"]);
+ //Form addr_zoom
+ $verif_addr_zoom = ($_REQUEST["addr_zoom"] == 1) ? "1" : "0";
+ $obj->setVar("addr_zoom", $verif_addr_zoom);
+ //Form addr_phone
+ $obj->setVar("addr_phone", $_REQUEST["addr_phone"]);
+ //Form addr_mobile
+ $obj->setVar("addr_mobile", $_REQUEST["addr_mobile"]);
+ //Form addr_fax
+ $obj->setVar("addr_fax", $_REQUEST["addr_fax"]);
+ //Form addr_contemail
+ $obj->setVar("addr_contemail", $_REQUEST["addr_contemail"]);
+ //Form addr_opentime
+ $obj->setVar("addr_opentime", $_REQUEST["addr_opentime"]);
+ //Form addr_logourl
+ $obj->setVar("addr_logourl", $_REQUEST["addr_logourl"]);
+ //Form addr_submitter
+ $obj->setVar("addr_submitter", $_REQUEST["addr_submitter"]);
+ //Form addr_status
+ $verif_addr_status = ($_REQUEST["addr_status"] == 1) ? "1" : "0";
+ $obj->setVar("addr_status", $verif_addr_status);
+ //Form addr_date
+ $obj->setVar("addr_date", strtotime($_REQUEST["addr_date"]));
+ //Form addr_hits
+ $obj->setVar("addr_hits", $_REQUEST["addr_hits"]);
+ //Form addr_rating
+ $obj->setVar("addr_rating", $_REQUEST["addr_rating"]);
+ //Form addr_votes
+ $obj->setVar("addr_votes", $_REQUEST["addr_votes"]);
+ //Form addr_comments
+ $obj->setVar("addr_comments", $_REQUEST["addr_comments"]);
+
+
+ if ($addrHandler->insert($obj)) {
+ redirect_header("addr.php?op=list", 2, _AM_ADDRESSES_FORMOK);
+ }
+
+ echo $obj->getHtmlErrors();
+ $form =& $obj->getForm();
+ $form->display();
+ break;
+
+ case "edit_addr":
+ echo $adminMenu->addNavigation("addr.php");
+ $adminMenu->addItemButton(_AM_ADDRESSES_NEWADDR, 'addr.php?op=new_addr', 'add');
+ $adminMenu->addItemButton(_AM_ADDRESSES_ADDRLIST, 'addr.php?op=list', 'list');
+ echo $adminMenu->renderButton();
+ $obj = $addrHandler->get($_REQUEST["addr_id"]);
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+ case "delete_addr":
+ $obj =& $addrHandler->get($_REQUEST["addr_id"]);
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("addr.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($addrHandler->delete($obj)) {
+ redirect_header("addr.php", 3, _AM_ADDRESSES_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "addr_id" => $_REQUEST["addr_id"], "op" => "delete_addr"), $_SERVER["REQUEST_URI"], sprintf(_AM_ADDRESSES_FORMSUREDEL, $obj->getVar("addr")));
+ }
+ break;
+}
+include "admin_footer.php";
+?>
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/admin_footer.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/admin_footer.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/admin_footer.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,36 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+
+echo "<div align='center'><a href='http://www.xoops.org' target='_blank'>
+ <img src='".$pathIcon32."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a></div>";
+echo "<div class='center smallsmall italic pad5'>
+ <strong>" . $xoopsModule->getVar('name') . "</strong> "._AM_ADDRESSES_MAINTAINEDBY."
+ <a href='http://www.txmodxoops.org/modules/newbb' title='Visit TXMod Xoops Community' class='tooltip' rel='external'>TXMod Xoops Community</a></div>";
+xoops_cp_footer();
Added: XoopsModules/addresses/branches/timgno/addresses/admin/admin_header.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/admin_header.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/admin_header.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,65 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once '../include/config.php';
+include_once '../include/functions.php';
+
+$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
+
+$pathIcon16 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons16');
+$pathIcon32 = XOOPS_URL .'/'. $GLOBALS['xoopsModule']->getInfo('icons32');
+$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
+//load handlers
+$brokenHandler =& xoops_getModuleHandler('addresses_broken', $thisDirname);
+$catHandler =& xoops_getModuleHandler('addresses_cat', $thisDirname);
+$addrHandler =& xoops_getModuleHandler('addresses_addr', $thisDirname);
+$votedataHandler =& xoops_getModuleHandler('addresses_votedata', $thisDirname);
+
+$myts =& MyTextSanitizer::getInstance();
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
+$xoopsTpl->assign('pathIcon32', $pathIcon32);
+//Load languages
+xoops_loadLanguage('admin', $thisDirname);
+xoops_loadLanguage('modinfo', $thisDirname);
+xoops_loadLanguage('main', $thisDirname);
+// Locad admin menu class
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+}else{
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+}
+xoops_cp_header();
+$adminMenu = new ModuleAdmin();
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/broken.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/broken.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/broken.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,121 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+
+include "admin_header.php";
+//It recovered the value of argument op in URL$
+$op = addresses_CleanVars($_REQUEST, 'op', 'list', 'string');
+switch ($op)
+{
+ case "list":
+ default:
+ echo $adminMenu->addNavigation('broken.php');
+ $adminMenu->addItemButton(_AM_ADDRESSES_NEWADDR, 'addr.php?op=new_addr', 'add');
+ echo $adminMenu->renderButton();
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("broken_id");
+ $criteria->setOrder("ASC");
+ $numrows = $brokenHandler->getCount();
+ $broken_arr = $brokenHandler->getall($criteria);
+
+ //Affichage du tableau
+ if ($numrows>0)
+ {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._AM_ADDRESSES_BROKEN_AID."</th>
+ <th class='center'>"._AM_ADDRESSES_BROKEN_SENDER."</th>
+ <th class='center'>"._AM_ADDRESSES_BROKEN_IP."</th>
+ <th align='center' width='10%'>"._AM_ADDRESSES_FORMACTION."</th>
+ </tr>";
+
+ $class = "odd";
+
+ foreach (array_keys($broken_arr) as $i)
+ {
+ if ( $broken_arr[$i]->getVar("topic_pid") == 0)
+ {
+ echo "<tr class='".$class."'>";
+ $class = ($class == "even") ? "odd" : "even";
+
+ $addr =& $addrHandler->get($broken_arr[$i]->getVar("broken_aid"));
+ $title_addr = $addr->getVar("addr_cid");
+ echo "<td class='center'>".$title_addr."</td>";
+ echo "<td class='center'>".XoopsUser::getUnameFromId($broken_arr[$i]->getVar("broken_sender"),"S")."</td>";
+ echo "<td class='center'>".$broken_arr[$i]->getVar("broken_ip")."</td>";
+
+ echo "<td align='center' width='10%'>
+ <a href='broken.php?op=edit_broken&broken_id=".$broken_arr[$i]->getVar("broken_id")."'><img src=".$pathIcon16."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
+ <a href='broken.php?op=delete_broken&broken_id=".$broken_arr[$i]->getVar("broken_id")."'><img src=".$pathIcon16."/delete.png alt='"._DELETE."' title='"._DELETE."'></a>
+ </td>";
+ echo "</tr>";
+ }
+ }
+ echo "</table><br /><br />";
+ } else {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._AM_ADDRESSES_BROKEN_AID."</th>
+ <th class='center'>"._AM_ADDRESSES_BROKEN_SENDER."</th>
+ <th class='center'>"._AM_ADDRESSES_BROKEN_IP."</th>
+ <th align='center' width='10%'>"._AM_ADDRESSES_FORMACTION."</th>
+ </tr><tr class='errorMsg'><td colspan='4'>No Broken</td></tr>";
+ echo "</table><br /><br />";
+ }
+
+ break;
+
+ case "edit_broken":
+ echo $adminMenu->addNavigation("broken.php");
+ $adminMenu->addItemButton(_AM_ADDRESSES_NEWBROKEN, 'addr.php?op=new_addr', 'add');
+ $adminMenu->addItemButton(_AM_ADDRESSES_BROKENLIST, 'broken.php?op=list', 'list');
+ echo $adminMenu->renderButton();
+ $obj = $brokenHandler->get($_REQUEST["broken_id"]);
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+ case "delete_broken":
+ $obj =& $brokenHandler->get($_REQUEST["broken_id"]);
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("broken.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($brokenHandler->delete($obj)) {
+ redirect_header("broken.php", 3, _AM_ADDRESSES_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "broken_id" => $_REQUEST["broken_id"], "op" => "delete_broken"), $_SERVER["REQUEST_URI"], sprintf(_AM_ADDRESSES_FORMSUREDEL, $obj->getVar("broken")));
+ }
+ break;
+}
+include "admin_footer.php";
+?>
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/cat.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/cat.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/cat.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,169 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+
+include "admin_header.php";
+//It recovered the value of argument op in URL$
+$op = addresses_CleanVars($_REQUEST, 'op', 'list', 'string');
+switch ($op)
+{
+ case "list":
+ default:
+ echo $adminMenu->addNavigation('cat.php');
+ $adminMenu->addItemButton(_AM_ADDRESSES_CATLIST, 'cat.php?op=list', 'list');
+ $adminMenu->addItemButton(_AM_ADDRESSES_NEWCAT, 'cat.php?op=new_cat', 'add');
+ echo $adminMenu->renderButton();
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("cat_id");
+ $criteria->setOrder("ASC");
+ $numrows = $catHandler->getCount();
+ $cat_arr = $catHandler->getall($criteria);
+
+ //Affichage du tableau
+ if ($numrows>0)
+ {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._AM_ADDRESSES_CAT_PID."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_TITLE."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_DESCRIPTION."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_IMGURL."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_SHOW_MAP."</th>
+ <th align='center' width='10%'>"._AM_ADDRESSES_FORMACTION."</th>
+ </tr>";
+
+ $class = "odd";
+
+ foreach (array_keys($cat_arr) as $i)
+ {
+ if ( $cat_arr[$i]->getVar("topic_pid") == 0)
+ {
+ echo "<tr class='".$class."'>";
+ $class = ($class == "even") ? "odd" : "even";
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_pid")."</td>";
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_title")."</td>";
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_description")."</td>";
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_imgurl")."</td>";
+
+ $verif_cat_show_map = ( $cat_arr[$i]->getVar("cat_show_map") == 1 ) ? _YES : _NO;
+ echo "<td class='center'>".$verif_cat_show_map."</td>";
+
+ echo "<td align='center' width='10%'>
+ <a href='cat.php?op=edit_cat&cat_id=".$cat_arr[$i]->getVar("cat_id")."'><img src=".$pathIcon16."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
+ <a href='cat.php?op=delete_cat&cat_id=".$cat_arr[$i]->getVar("cat_id")."'><img src=".$pathIcon16."/delete.png alt='"._DELETE."' title='"._DELETE."'></a>
+ </td>";
+ echo "</tr>";
+ }
+ }
+ echo "</table><br /><br />";
+ } else {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._AM_ADDRESSES_CAT_PID."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_TITLE."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_DESCRIPTION."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_IMGURL."</th>
+ <th class='center'>"._AM_ADDRESSES_CAT_SHOW_MAP."</th>
+ <th align='center' width='10%'>"._AM_ADDRESSES_FORMACTION."</th>
+ </tr><tr class='errorMsg'><td colspan='6'>No Broken</td></tr>";
+ echo "</table><br /><br />";
+ }
+
+ break;
+
+ case "new_cat":
+ echo $adminMenu->addNavigation("cat.php");
+ $adminMenu->addItemButton(_AM_ADDRESSES_CATLIST, 'cat.php?op=list', 'list');
+ echo $adminMenu->renderButton();
+
+ $obj =& $catHandler->create();
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+ case "save_cat":
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if (isset($_REQUEST["cat_id"])) {
+ $obj =& $catHandler->get($_REQUEST["cat_id"]);
+ } else {
+ $obj =& $catHandler->create();
+ }
+
+ //Form cat_pid
+ $obj->setVar("cat_pid", $_REQUEST["cat_pid"]);
+ //Form cat_title
+ $obj->setVar("cat_title", $_REQUEST["cat_title"]);
+ //Form cat_description
+ $obj->setVar("cat_description", $_REQUEST["cat_description"]);
+ //Form cat_imgurl
+ $obj->setVar("cat_imgurl", $_REQUEST["cat_imgurl"]);
+ //Form cat_show_map
+ $verif_cat_show_map = ($_REQUEST["cat_show_map"] == 1) ? "1" : "0";
+ $obj->setVar("cat_show_map", $verif_cat_show_map);
+
+
+ if ($catHandler->insert($obj)) {
+ redirect_header("cat.php?op=list", 2, _AM_ADDRESSES_FORMOK);
+ }
+
+ echo $obj->getHtmlErrors();
+ $form =& $obj->getForm();
+ $form->display();
+ break;
+
+ case "edit_cat":
+ echo $adminMenu->addNavigation("cat.php");
+ $adminMenu->addItemButton(_AM_ADDRESSES_NEWCAT, 'cat.php?op=new_cat', 'add');
+ $adminMenu->addItemButton(_AM_ADDRESSES_CATLIST, 'cat.php?op=list', 'list');
+ echo $adminMenu->renderButton();
+ $obj = $catHandler->get($_REQUEST["cat_id"]);
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+ case "delete_cat":
+ $obj =& $catHandler->get($_REQUEST["cat_id"]);
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($catHandler->delete($obj)) {
+ redirect_header("cat.php", 3, _AM_ADDRESSES_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "cat_id" => $_REQUEST["cat_id"], "op" => "delete_cat"), $_SERVER["REQUEST_URI"], sprintf(_AM_ADDRESSES_FORMSUREDEL, $obj->getVar("cat")));
+ }
+ break;
+}
+include "admin_footer.php";
+?>
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/index.html
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/index.html (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/index.html 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/index.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/index.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/index.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,53 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ****************************************************************************
+ */
+include "admin_header.php";
+ //count "total broken"
+ $count_broken = $brokenHandler->getCount();
+ //count "total cat"
+ $count_cat = $catHandler->getCount();
+ //count "total addr"
+ $count_addr = $addrHandler->getCount();
+ //count "total votedata"
+ $count_votedata = $votedataHandler->getCount();
+ // InfoBox votedata
+ $adminMenu->addInfoBox(_AM_ADDRESSES_STATISTICS);
+ // InfoBox broken
+ $adminMenu->addInfoBoxLine(_AM_ADDRESSES_STATISTICS,_AM_ADDRESSES_THEREARE_BROKEN, $count_broken);
+ // InfoBox cat
+ $adminMenu->addInfoBoxLine(_AM_ADDRESSES_STATISTICS,_AM_ADDRESSES_THEREARE_CAT, $count_cat);
+ // InfoBox addr
+ $adminMenu->addInfoBoxLine(_AM_ADDRESSES_STATISTICS,_AM_ADDRESSES_THEREARE_ADDR, $count_addr);
+ // InfoBox votedata
+ $adminMenu->addInfoBoxLine(_AM_ADDRESSES_STATISTICS,_AM_ADDRESSES_THEREARE_VOTEDATA, $count_votedata);
+ // Render Index
+ echo $adminMenu->addNavigation("index.php");
+ echo $adminMenu->renderIndex();
+include "admin_footer.php";
+?>
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/menu.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/menu.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/menu.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,61 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 12:31:43 : Timgno Exp $
+ * ****************************************************************************
+ */
+$dirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+$module_handler =& xoops_gethandler("module");
+$xoopsModule =& XoopsModule::getByDirname($dirname);
+$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid"));
+$pathIcons32 = $moduleInfo->getInfo("icons32");
+$adminmenu = array();
+$i = 1;
+$adminmenu[$i]["title"] = _MI_ADDRESSES_ADMENU1;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["icon"] = "../../".$pathIcons32."/home.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_ADDRESSES_ADMENU3;
+$adminmenu[$i]["link"] = "admin/cat.php";
+$adminmenu[$i]["icon"] = "images/32/addresses_cat.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_ADDRESSES_ADMENU4;
+$adminmenu[$i]["link"] = "admin/addr.php";
+$adminmenu[$i]["icon"] = "images/32/addresses_add.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_ADDRESSES_ADMENU2;
+$adminmenu[$i]["link"] = "admin/broken.php";
+$adminmenu[$i]["icon"] = "images/32/addresses_broken.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_ADDRESSES_ADMENU5;
+$adminmenu[$i]["link"] = "admin/votedata.php";
+$adminmenu[$i]["icon"] = "images/32/addresses_stats.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_ADDRESSES_ADMENU6;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = "../../".$pathIcons32."/about.png";
+unset( $i );
+?>
\ No newline at end of file
Added: XoopsModules/addresses/branches/timgno/addresses/admin/votedata.php
===================================================================
--- XoopsModules/addresses/branches/timgno/addresses/admin/votedata.php (rev 0)
+++ XoopsModules/addresses/branches/timgno/addresses/admin/votedata.php 2012-06-26 14:11:03 UTC (rev 9725)
@@ -0,0 +1,119 @@
+<?php
+/**
+ * ****************************************************************************
+ * - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ * ADDRESSES - MODULE FOR XOOPS
+ * Copyright (c) 2007 - 2012
+ * TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * Created by TDMCreate version 1.37
+ *
+ * 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. See the
+ * GNU General Public License for more details.
+ * ---------------------------------------------------------------------------
+ * @copyright TXMod Xoops (Timgno) ( http://www.txmodxoops.org )
+ * @license GNU GPL see License
+ * @since 2.5.0
+ * @package addresses
+ * @author TXMod Xoops (Timgno) ( su...@tx... )
+ *
+ * Version : 1.73 Tue 2012/06/26 13:30:40 : Timgno Exp $
+ * ***************************************************...
[truncated message content] |
|
From: <be...@us...> - 2012-06-26 10:32:39
|
Revision: 9724
http://xoops.svn.sourceforge.net/xoops/?rev=9724&view=rev
Author: beckmi
Date: 2012-06-26 10:32:29 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Changing status to RC
Modified Paths:
--------------
XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-26 09:34:10 UTC (rev 9723)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-26 10:32:29 UTC (rev 9724)
@@ -2,7 +2,7 @@
/**
* $Id$
* Module: WF-Links
- * Version: v1.0.3
+ * Version: v1.0.9
* Release Date: 21 June 2005
* Developer: John N
* Team: WF-Projects
@@ -13,7 +13,7 @@
$modversion['name'] = _MI_WFL_NAME;
$modversion['version'] = "1.09";
-$modversion['status'] = "Beta 1";
+$modversion['status'] = "RC";
$modversion['description'] = _MI_WFL_DESC;
$modversion['help'] = 'page=help';
$modversion['license'] = 'GNU GPL 2.0';
@@ -32,16 +32,16 @@
$modversion['author_email'] = "";
$modversion['demo_site_url'] = "";
$modversion['demo_site_name'] = "WF-Projects";
-$modversion['support_site_url'] = "http://members.lycos.nl/mcdonaldsstore/phpBB2/index.php?c=4";
-$modversion['support_site_name'] = "McDonalds Store Support Forum";
-$modversion['submit_bug'] = "http://members.lycos.nl/mcdonaldsstore/phpBB2/viewforum.php?f=8";
+$modversion['support_site_url'] = "www.xoops.org";
+$modversion['support_site_name'] = "XOOPS Project";
+$modversion['submit_bug'] = "www.xoops.org/modules/newbb";
$modversion['warning'] = _MI_WFL_WARNINGTEXT;
$modversion['author'] = "Catzwolf/McDonald";
$modversion['credits'] = "WF-Projects Team. Based on the module WF-Links, thanks to the dream-team for some code snippits.";
$modversion['author_credits'] = _MI_WFL_AUTHOR_CREDITSTEXT;
-$modversion['developer_website_url'] = "http://xoops.org/";
+$modversion['developer_website_url'] = "www.xoops.org/";
$modversion['developer_website_name'] = "XOOPS Project";
@@ -50,10 +50,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/06/25';
+$modversion['release_date'] = '2012/06/26';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 2";
+$modversion["module_status"] = "RC";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = '1.1';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-26 09:34:20
|
Revision: 9723
http://xoops.svn.sourceforge.net/xoops/?rev=9723&view=rev
Author: beckmi
Date: 2012-06-26 09:34:10 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
fixing deprecated xoops_getLinkedUnameFromId()
Modified Paths:
--------------
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-26 02:30:10 UTC (rev 9722)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-26 09:34:10 UTC (rev 9723)
@@ -62,6 +62,7 @@
include 'admin_header.php';
xoops_cp_header();
+ xoops_load('XoopsUserUtility');
//wfl_adminmenu( _AM_WFL_MLINKS );
if ( $lid > 0 ) {
@@ -71,7 +72,7 @@
<td width='33%' valign='top'>
<div><b>" . _AM_WFL_LINK_ID . " </b>" . $lid . "</div>
<div><b>" . _AM_WFL_MINDEX_SUBMITTED . ": </b>" . formatTimestamp( $link_array['date'], $xoopsModuleConfig['dateformat'] ) . "</div>
- <div><b>" . _AM_WFL_LINK_SUBMITTER . " </b>" . xoops_getLinkedUnameFromId( $submitter ) . "</div>
+ <div><b>" . _AM_WFL_LINK_SUBMITTER . " </b>" . XoopsUserUtility::getUnameFromId( $submitter ) . "</div>
<div><b>" . _AM_WFL_LINK_IP . " </b>" . $ipaddress . "</div>
<div><b>" . _AM_WFL_PAGERANK . " </b>" . pagerank($link_array['url']) . "</div>
<div><b>" . _AM_WFL_HITS . " </b>" . $link_array['hits'] . "</div>
@@ -427,7 +428,7 @@
$cid = $published['cid'];
$title = "<a href='../singlelink.php?cid=" . $published['cid'] . "&lid=" . $published['lid'] . "'>" . $wfmyts -> htmlSpecialCharsStrip( trim( $published['title'] ) ) . "</a>";;
$maintitle = urlencode( $wfmyts -> htmlSpecialChars( trim( $published['title'] ) ) );
- $submitter = xoops_getLinkedUnameFromId( $published['submitter'] );
+ $submitter = XoopsUserUtility::getUnameFromId( $published['submitter'] );
$publish = formatTimestamp( $published['published'], $xoopsModuleConfig['dateformatadmin'] );
$status = ( $published['published'] > 0 ) ? $imagearray['online'] : "<a href='newlinks.php'>" . $imagearray['offline'] . "</a>";
$icon = "<a href='main.php?op=edit&lid=" . $lid . "'>" . $imagearray['editimg'] . "</a> ";
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php 2012-06-26 02:30:10 UTC (rev 9722)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php 2012-06-26 09:34:10 UTC (rev 9723)
@@ -12,7 +12,7 @@
include 'admin_header.php';
global $mytree, $xoopsModuleConfig;
-
+xoops_load('XoopsUserUtility');
$op = wfl_cleanRequestVars( $_REQUEST, 'op', '' );
$requestid = wfl_cleanRequestVars( $_REQUEST, 'requestid', 0 );
@@ -31,7 +31,7 @@
unset( $sql );
$orig_user = new XoopsUser( $orig_array['submitter'] );
- $submittername = xoops_getLinkedUnameFromId( $orig_array['submitter'] );
+ $submittername = XoopsUserUtility::getUnameFromId( $orig_array['submitter'] );
$submitteremail = $orig_user -> getUnameFromId( "email" );
echo "<div><b>" . _AM_WFL_MOD_MODPOSTER . "</b> $submittername</div>";
@@ -70,7 +70,7 @@
$sform -> display();
$orig_user = new XoopsUser( $mod_array['modifysubmitter'] );
- $submittername = xoops_getLinkedUnameFromId( $mod_array['modifysubmitter'] );
+ $submittername = XoopsUserUtility::getUnameFromId( $mod_array['modifysubmitter'] );
$submitteremail = $orig_user -> getUnameFromId( "email" );
echo "<div><b>" . _AM_WFL_MOD_MODIFYSUBMITTER . "</b> $submittername</div>";
@@ -196,7 +196,7 @@
$path = str_replace( "/", "", $path );
$path = str_replace( ":", "", trim( $path ) );
$title = trim( $path );
- $submitter = xoops_getLinkedUnameFromId( $link_arr['modifysubmitter'] );;
+ $submitter = XoopsUserUtility::getUnameFromId( $link_arr['modifysubmitter'] );;
$requestdate = formatTimestamp( $link_arr['requestdate'], $xoopsModuleConfig['dateformatadmin'] );
echo "<tr style='text-align: center;'>\n";
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php 2012-06-26 02:30:10 UTC (rev 9722)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php 2012-06-26 09:34:10 UTC (rev 9723)
@@ -56,7 +56,7 @@
default:
global $xoopsModuleConfig;
-
+ xoops_load('XoopsUserUtility');
$start = wfl_cleanRequestVars( $_REQUEST, 'start', 0 );
$sql = "SELECT * FROM " . $xoopsDB -> prefix( 'wflinks_links' ) . " WHERE published = 0 ORDER BY lid DESC" ;
if ( !$result = $xoopsDB -> query( $sql ) ) {
@@ -92,7 +92,7 @@
$title = $wfmyts -> htmlSpecialCharsStrip( $new['title'] );
$url = urldecode( $wfmyts -> htmlSpecialCharsStrip( $new['url'] ) );
$logourl = $wfmyts -> htmlSpecialCharsStrip( $new['screenshot'] );
- $submitter = xoops_getLinkedUnameFromId( $new['submitter'] );
+ $submitter = XoopsUserUtility::getUnameFromId( $new['submitter'] );
$datetime = formatTimestamp( $new['date'], $xoopsModuleConfig['dateformatadmin'] );
$icon = ( $new['published'] ) ? $approved : "<a href='newlinks.php?op=approve&lid=" . $lid . "'>" . $imagearray['approve'] . "</a> ";
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php 2012-06-26 02:30:10 UTC (rev 9722)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php 2012-06-26 09:34:10 UTC (rev 9723)
@@ -89,6 +89,7 @@
$xoopsOption['template_main'] = 'wflinks_brokenlink.html';
include XOOPS_ROOT_PATH . '/header.php';
+ xoops_load('XoopsUserUtility');
$catarray['imageheader'] = wfl_imageheader();
$catarray['letters'] = wfl_letters();
@@ -105,7 +106,7 @@
if ( is_array( $broke_arr ) ) {
$broken['title'] = $wfmyts -> htmlSpecialCharsStrip( $link_arr['title'] );
$broken['id'] = $broke_arr['reportid'];
- $broken['reporter'] = xoops_getLinkedUnameFromId( $broke_arr['sender'] );
+ $broken['reporter'] = XoopsUserUtility::getUnameFromId( $broke_arr['sender'] );
$broken['date'] = formatTimestamp( $broke_arr['date'], $xoopsModuleConfig['dateformat'] );
$broken['acknowledged'] = ( $broke_arr['acknowledged'] == 1 ) ? _YES : _NO ;
$broken['confirmed'] = ( $broke_arr['confirmed'] == 1 ) ? _YES : _NO ;
@@ -122,7 +123,7 @@
$time = ( $link_arr['published'] > 0 ) ? $link_arr['published'] : $link_arr['updated'];
$link['updated'] = formatTimestamp( $time, $xoopsModuleConfig['dateformat'] );
$is_updated = ( $link_arr['updated'] != 0 ) ? _MD_WFL_UPDATEDON : _MD_WFL_SUBMITDATE;
- $link['publisher'] = xoops_getLinkedUnameFromId($link_arr['submitter'] );
+ $link['publisher'] = XoopsUserUtility::getUnameFromId($link_arr['submitter'] );
$xoopsTpl -> assign( 'link_id', intval($lid) );
$xoopsTpl -> assign( 'lang_subdate' , $is_updated );
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-26 02:30:10 UTC (rev 9722)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-26 09:34:10 UTC (rev 9723)
@@ -4,7 +4,7 @@
- changed editor list selection to dynamic (mamba)
- replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine)
-- fixed bug related to $wfmyts constructor overriding
+- fixed bug related to $wfmyts constructor overriding (mamba)
=========================================================
24-06-2012 1.09 Beta 1
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php 2012-06-26 02:30:10 UTC (rev 9722)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php 2012-06-26 09:34:10 UTC (rev 9723)
@@ -778,14 +778,14 @@
function wfl_linklistbody( $published ) {
global $wfmyts, $imagearray, $xoopsModuleConfig, $xoopsModule;
-
+ xoops_load('XoopsUserUtility');
$lid = $published['lid'];
$cid = $published['cid'];
$title = "<a href='../singlelink.php?cid=" . $published['cid'] . "&lid=" . $published['lid'] . "'>" . $wfmyts -> htmlSpecialCharsStrip( trim( $published['title'] ) ) . "</a>";;
$maintitle = urlencode( $wfmyts -> htmlSpecialChars( trim( $published['title'] ) ) );
$cattitle = wfl_cattitle($published['cid']);
- $submitter = xoops_getLinkedUnameFromId( $published['submitter'] );
+ $submitter = XoopsUserUtility::getUnameFromId( $published['submitter'] );
$hwhoisurl = str_replace( 'http://', '', $published['url']);
$submitted = formatTimestamp( $published['date'], $xoopsModuleConfig['dateformat'] );
$publish = ( $published['published'] > 0 ) ? formatTimestamp( $published['published'], $xoopsModuleConfig['dateformatadmin'] ): 'Not Published';
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-26 02:30:10 UTC (rev 9722)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-26 09:34:10 UTC (rev 9723)
@@ -73,8 +73,8 @@
$description = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 );
$link['description'] = xoops_substr( $description, 0, $xoopsModuleConfig['totalchars'], '...' );
-
-$link['submitter'] = xoops_getLinkedUnameFromId( $link_arr['submitter'] );
+xoops_load('XoopsUserUtility');
+$link['submitter'] = XoopsUserUtility::getUnameFromId( $link_arr['submitter'] );
$link['publisher'] = ( isset( $link_arr['publisher'] ) && !empty( $link_arr['publisher'] ) ) ? $wfmyts -> htmlSpecialCharsStrip( $link_arr['publisher'] ) : _MD_WFL_NOTSPECIFIED;
$country = $link_arr['country'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-26 02:30:17
|
Revision: 9722
http://xoops.svn.sourceforge.net/xoops/?rev=9722&view=rev
Author: beckmi
Date: 2012-06-26 02:30:10 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
- changed editor list selection to dynamic (mamba)
- replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine)
- fixed bug related to $wfmyts constructor overriding (mamba)
Modified Paths:
--------------
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html
XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -133,9 +133,25 @@
ob_end_clean();
// Link description form
- $editor = wfl_getWysiwygForm( _AM_WFL_LINK_DESCRIPTION, 'descriptionb', $descriptionb, 15, 60 );
- $sform -> addElement($editor, false);
+// $editor = wfl_getWysiwygForm( _AM_WFL_LINK_DESCRIPTION, 'descriptionb', $descriptionb, 15, 60 );
+// $sform -> addElement($editor, false);
+ $optionsTrayNote = new XoopsFormElementTray(_AM_WFL_LINK_DESCRIPTION, '<br />');
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'descriptionb';
+ $options['value'] = $descriptionb;
+ $options['rows'] = 5;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ $descriptionb = new XoopsFormEditor('', $xoopsModuleConfig['form_options'], $options, $nohtml = FALSE, $onfailure = 'textarea');
+ $optionsTrayNote->addElement($descriptionb);
+ } else {
+ $descriptionb = new XoopsFormDhtmlTextArea('', 'descriptionb', $item->getVar('descriptionb', 'e'), '100%', '100%');
+ $optionsTrayNote->addElement($descriptionb);
+ }
+ $sform->addElement($optionsTrayNote, FALSE);
+
// Meta keywords form
$keywords = new XoopsFormTextArea( _AM_WFL_KEYWORDS, 'keywords', $keywords, 7, 60, false );
$keywords -> setDescription( "<small>" . _AM_WFL_KEYWORDS_NOTE . "</small>");
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -11,8 +11,6 @@
*/
class wflTextSanitizer extends MyTextSanitizer
{
- function wflTextSanitizer() {
- }
function htmlSpecialCharsStrip( $text )
{
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-26 02:30:10 UTC (rev 9722)
@@ -1,6 +1,14 @@
-======================================================
-24-06-2012 1.09 Beta
-============================================================
+=========================================================
+25-06-2012 1.09 Beta 2
+=========================================================
+
+- changed editor list selection to dynamic (mamba)
+- replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine)
+- fixed bug related to $wfmyts constructor overriding
+
+=========================================================
+24-06-2012 1.09 Beta 1
+=========================================================
Shine and Mamba:
Fixed: Admin section:
- missing image: Frameworks/moduleclasses/icons/16/folder_add.png
@@ -11,7 +19,7 @@
2012-04-25 1.08 Beta 1
=========================================================
-- converted to XOOPS 2.5.x Admin GUI (mamba)-
+- converted to XOOPS 2.5.x Admin GUI (mamba)
===========================================================
23-6-2012 1.07 Final
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -71,6 +71,7 @@
$link['updated'] = formatTimestamp( $time, $xoopsModuleConfig['dateformat'] );
$description = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 );
+
$link['description'] = xoops_substr( $description, 0, $xoopsModuleConfig['totalchars'], '...' );
$link['submitter'] = xoops_getLinkedUnameFromId( $link_arr['submitter'] );
@@ -152,5 +153,4 @@
$link['showpagerank'] = $xoopsModuleConfig['showpagerank'];
$link['quickview'] = $xoopsModuleConfig['quickview'];
$link['comment_rules'] = $xoopsModuleConfig['com_rule'];
-$link['autoscrshot'] = $xoopsModuleConfig['useautothumb'];
-?>
\ No newline at end of file
+$link['autoscrshot'] = $xoopsModuleConfig['useautothumb'];
\ No newline at end of file
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -54,7 +54,7 @@
$xoopsTpl -> assign('tagbar', tagBar($link_arr['lid'], 0));
}
-$link['imageheader'] = wfl_imageheader();
+//$link['imageheader'] = wfl_imageheader();
$link['id'] = $link_arr['lid'];
$link['cid'] = $link_arr['cid'];
$link['description2'] = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 );
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -274,9 +274,26 @@
ob_end_clean();
// Link description form
- $editor = wfl_getWysiwygForm( _MD_WFL_DESCRIPTIONC, 'descriptionb', $descriptionb, 15, 60 );
- $sform -> addElement($editor,false);
+// $editor = wfl_getWysiwygForm( _MD_WFL_DESCRIPTIONC, 'descriptionb', $descriptionb, 15, 60 );
+// $sform -> addElement($editor,false);
+$optionsTrayNote = new XoopsFormElementTray(_MD_WFL_DESCRIPTIONC, '<br />');
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'descriptionb';
+ $options['value'] = $descriptionb;
+ $options['rows'] = 5;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ $editor = new XoopsFormEditor('', $xoopsModuleConfig['form_optionsuser'], $options, $nohtml = FALSE, $onfailure = 'textarea');
+ $optionsTrayNote->addElement($editor);
+ } else {
+ $editor = new XoopsFormDhtmlTextArea('', 'descriptionb', $item->getVar('descriptionb', 'e'), '100%', '100%');
+ $optionsTrayNote->addElement($editor);
+ }
+
+ $sform->addElement($optionsTrayNote, FALSE);
+
// Keywords form
$keywords = new XoopsFormTextArea( _MD_WFL_KEYWORDS, 'keywords', $keywords, 7, 60, false );
$keywords -> setDescription( "<small>" . _MD_WFL_KEYWORDS_NOTE . "</small>");
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html 2012-06-26 02:30:10 UTC (rev 9722)
@@ -25,7 +25,7 @@
<td width="65%" valign="top"> <{if $wfllink.autoscrshot == 0}> <{if $show_screenshot == true}> <{if $wfllink.screenshot_full != ''}>
<div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="<{$wfllink.screenshot_thumb}>" alt="" hspace="7" vspace="3" border="0" align="right" /></a> </div>
<{/if}> <{/if}> <{/if}>
-<{if $wfllink.autoscrshot == 1}> <div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="http://mozshot.nemui.org/shot/128x128?<{$wfllink.url}>" align="right" /></a> </div> <{/if}>
+ <{if $wfllink.autoscrshot == 1}> <div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="http://open.thumbshots.org/image.pxf?url=<{$wfllink.url}>" align="right" /></a> </div> <{/if}>
<div style="margin-left: 6px;" align="left">
<a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank">
<img src="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/images/icon/links.gif" alt="" align="absmiddle" />
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -50,10 +50,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/06/23';
+$modversion['release_date'] = '2012/06/25';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "Beta 2";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = '1.1';
@@ -285,38 +285,67 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0;
+//--------------------------------------------------------------------
+//$i++;
+//$modversion['config'][$i]['name'] = 'form_options';
+//$modversion['config'][$i]['title'] = '_MI_WFL_EDITOR';
+//$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICE';
+//$modversion['config'][$i]['formtype'] = 'select';
+//$modversion['config'][$i]['valuetype'] = 'text';
+//$modversion['config'][$i]['default'] = 'dhtml';
+//$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
+// _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
+// _MI_WFL_FORM_COMPACT => 'textarea',
+// _MI_WFL_FORM_HTMLAREA => 'htmlarea',
+// _MI_WFL_FORM_KOIVI => 'koivi',
+// _MI_WFL_FORM_FCK => 'fck',
+// _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
+// _MI_WFL_FORM_TINYMCE => 'tinymce'
+// );
+//$i++;
+//$modversion['config'][$i]['name'] = 'form_optionsuser';
+//$modversion['config'][$i]['title'] = '_MI_WFL_EDITORUSER';
+//$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICEUSER';
+//$modversion['config'][$i]['formtype'] = 'select';
+//$modversion['config'][$i]['valuetype'] = 'text';
+//$modversion['config'][$i]['default'] = 'dhtml';
+//$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
+// _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
+// _MI_WFL_FORM_COMPACT => 'textarea',
+// _MI_WFL_FORM_HTMLAREA => 'htmlarea',
+// _MI_WFL_FORM_KOIVI => 'koivi',
+// _MI_WFL_FORM_FCK => 'fck',
+// _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
+// _MI_WFL_FORM_TINYMCE => 'tinymce'
+// );
+//--------------------------------------------------------------------
$i++;
-$modversion['config'][$i]['name'] = 'form_options';
-$modversion['config'][$i]['title'] = '_MI_WFL_EDITOR';
-$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICE';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'dhtml';
-$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
- _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
- _MI_WFL_FORM_COMPACT => 'textarea',
- _MI_WFL_FORM_HTMLAREA => 'htmlarea',
- _MI_WFL_FORM_KOIVI => 'koivi',
- _MI_WFL_FORM_FCK => 'fck',
- _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
- _MI_WFL_FORM_TINYMCE => 'tinymce'
- );
+xoops_load('XoopsEditorHandler');
+$editor_handler = XoopsEditorHandler::getInstance();
+$editorList = array_flip($editor_handler->getList());
+
+$modversion['config'][$i] = array(
+ 'name' => 'form_options',
+ 'title' => '_MI_WFL_EDITOR',
+ 'description' => '_MI_WFL_EDITORCHOICE',
+ 'formtype' => 'select',
+ 'valuetype' => 'text',
+ 'options' => $editorList,
+ 'default' => 'dhtmltextarea'
+);
+
+
$i++;
-$modversion['config'][$i]['name'] = 'form_optionsuser';
-$modversion['config'][$i]['title'] = '_MI_WFL_EDITORUSER';
-$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICEUSER';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'dhtml';
-$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
- _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
- _MI_WFL_FORM_COMPACT => 'textarea',
- _MI_WFL_FORM_HTMLAREA => 'htmlarea',
- _MI_WFL_FORM_KOIVI => 'koivi',
- _MI_WFL_FORM_FCK => 'fck',
- _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
- _MI_WFL_FORM_TINYMCE => 'tinymce'
- );
+$modversion['config'][$i] = array(
+ 'name' => 'form_optionsuser',
+ 'title' => '_MI_WFL_EDITORUSER',
+ 'description' => '_MI_WFL_EDITORCHOICEUSER',
+ 'formtype' => 'select',
+ 'valuetype' => 'text',
+ 'options' => $editorList,
+ 'default' => 'dhtmltextarea'
+);
+
$i++;
$modversion['config'][$i]['name'] = 'screenshot';
$modversion['config'][$i]['title'] = '_MI_WFL_USESHOTS';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-25 19:19:16
|
Revision: 9721
http://xoops.svn.sourceforge.net/xoops/?rev=9721&view=rev
Author: beckmi
Date: 2012-06-25 19:19:10 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
English corrections
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-25 19:03:20 UTC (rev 9720)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-25 19:19:10 UTC (rev 9721)
@@ -232,8 +232,8 @@
define('_MD_USERNOEXIST','That user does not exist. Please go back and search again.');
define('_MD_COULDNOTREMOVE','Error - Could not remove posts from the database!');
define('_MD_COULDNOTREMOVETXT','Error - Could not remove post texts!');
-define('_MD_TIMEISUP','Your have reach the timelimit for editing your post.');
-define('_MD_TIMEISUPDEL','Your have reach the timelimit for deleting your post.');
+define('_MD_TIMEISUP','You\'ve reached the time limit for editing your post.');
+define('_MD_TIMEISUPDEL','You\'ve reached the time limit for deleting your post.');
//reply.php
define('_MD_ON','on'); //Posted on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-25 19:03:26
|
Revision: 9720
http://xoops.svn.sourceforge.net/xoops/?rev=9720&view=rev
Author: dhcst
Date: 2012-06-25 19:03:20 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
replace language/english/admin.php
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-25 18:55:17 UTC (rev 9719)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-25 19:03:20 UTC (rev 9720)
@@ -7,7 +7,7 @@
//%%%%%% File Name index.php %%%%%
define("_AM_NEWBB_FORUMCONF", "Forum Configuration");
define("_AM_NEWBB_ADDAFORUM", "Add a Forum");
-define("_AM_NEWBB_SYNCFORUM", "Sync forum");
+define("_AM_NEWBB_SYNCFORUM", "Sync Forum");
define("_AM_NEWBB_REORDERFORUM", "Reorder");
define("_AM_NEWBB_FORUM_MANAGER", "Forums");
define("_AM_NEWBB_PRUNE_TITLE", "Prune");
@@ -35,12 +35,12 @@
define("_AM_NEWBB_POSTSAVED", "Post has been saved");
define("_AM_NEWBB_POSTNOTSAVED", "Post has NOT been saved");
define("_AM_NEWBB_TOPICAPPROVED", "Topic has been approved");
-define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has been NOT approved");
+define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has NOT been approved");
define("_AM_NEWBB_TOPICID", "Topic ID");
define("_AM_NEWBB_ORPHAN_TOPICS_FOR_AUTH", "Unapproved topics authorization");
-define('_AM_NEWBB_DEL_ONE','Delete only this message');
+define('_AM_NEWBB_DEL_ONE','Delete only this post');
define('_AM_NEWBB_POSTSDELETED','Selected post deleted.');
-define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting approval.');
+define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting for approval.');
define('_AM_NEWBB_SUBJECTC','Subject:');
define('_AM_NEWBB_MESSAGEICON','Message Icon:');
define('_AM_NEWBB_MESSAGEC','Message:');
@@ -57,12 +57,12 @@
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
-define('_AM_NEWBB_ATTACHPATH','Path for attachment storing');
+define('_AM_NEWBB_ATTACHPATH','Path for attachment storage');
define('_AM_NEWBB_THUMBPATH','Path for attached image thumbs');
//define('_AM_NEWBB_RSSPATH','Path for RSS feed');
define('_AM_NEWBB_REPORT','Reported posts');
define('_AM_NEWBB_REPORT_PENDING','Pending report');
-define('_AM_NEWBB_REPORT_PROCESSED','processed report');
+define('_AM_NEWBB_REPORT_PROCESSED','Processed report');
define('_AM_NEWBB_CREATETHEDIR','Create it');
define('_AM_NEWBB_SETMPERM','Set the permission');
define('_AM_NEWBB_DIRCREATED','The directory has been created');
@@ -91,7 +91,7 @@
define("_AM_NEWBB_EDITTHISFORUM", "Editing Forum:");
define("_AM_NEWBB_SET_FORUMORDER", "Set Forum Position:");
define("_AM_NEWBB_ALLOWPOLLS", "Allow Polls:");
-define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in kb`s:");
+define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in KB`s:");
define("_AM_NEWBB_ALLOWED_EXTENSIONS", "Allowed Extensions:<span style='font-size: xx-small; font-weight: normal; display: block;'>'*' indicates no limititations.<br /> Extensions delimited by '|'</span>");
define("_AM_NEWBB_ALLOW_ATTACHMENTS", "Allow Attachments:");
define("_AM_NEWBB_ALLOWHTML", "Allow HTML:");
@@ -156,8 +156,8 @@
define("_AM_NEWBB_REORDERID", "ID");
define("_AM_NEWBB_REORDERTITLE", "Title");
define("_AM_NEWBB_REORDERWEIGHT", "Position");
-define("_AM_NEWBB_SETFORUMORDER", "Set Board Ordering");
-define("_AM_NEWBB_BOARDREORDER", "The Board has reordered to your specification");
+define("_AM_NEWBB_SETFORUMORDER", "Set Forum Ordering");
+define("_AM_NEWBB_BOARDREORDER", "The Forum has been reordered to your specification");
// admin_permission.php
define("_AM_NEWBB_PERMISSIONS_TO_THIS_FORUM", "Topic permissions for this Forum");
@@ -192,7 +192,7 @@
define ("_AM_NEWBB_PRUNE_RESULTS_POSTS", "Pruned Posts");
define ("_AM_NEWBB_PRUNE_RESULTS_FORUMS", "Pruned Forums");
define ("_AM_NEWBB_PRUNE_STORE", "Store posts in this forum instead of deleting them");
-define ("_AM_NEWBB_PRUNE_ARCHIVE", "Make a copy of posts into Archive");
+define ("_AM_NEWBB_PRUNE_ARCHIVE", "Save a copy of posts to Archive");
define ("_AM_NEWBB_PRUNE_FORUMSELERROR", "You forgot to select forum(s) to prune");
define ("_AM_NEWBB_PRUNE_DAYS", "Remove topics without replies in:");
define ("_AM_NEWBB_PRUNE_FORUMS", "Forums to be pruned");
@@ -213,7 +213,7 @@
define ("_AM_NEWBB_PRUNE_2YEARS", "2 Years");
// About.php constants
-define('_AM_NEWBB_AUTHOR_INFO', "Author Informations");
+define('_AM_NEWBB_AUTHOR_INFO', "Author Information");
define('_AM_NEWBB_AUTHOR_NAME', "Author");
define('_AM_NEWBB_AUTHOR_WEBSITE', "Author's website");
define('_AM_NEWBB_AUTHOR_EMAIL', "Author's email");
@@ -236,7 +236,7 @@
define("_AM_NEWBB_PROCESSREPORT", "View new reports");
define("_AM_NEWBB_REPORTTITLE", "Report title");
define("_AM_NEWBB_REPORTEXTRA", "Extra");
-define("_AM_NEWBB_REPORTPOST", "Reported post");
+define("_AM_NEWBB_REPORTPOST", "Report post");
define("_AM_NEWBB_REPORTTEXT", "Report text");
define("_AM_NEWBB_REPORTMEMO", "Process memo");
@@ -252,18 +252,18 @@
define("_AM_NEWBB_VOTE_USER", "User");
define("_AM_NEWBB_VOTE_IP", "IP Address");
define("_AM_NEWBB_VOTE_USERAVG", "Average User Rating");
-define("_AM_NEWBB_VOTE_TOTALRATE", "Total Ratings");
+define("_AM_NEWBB_VOTE_TOTALRATE", "Total Rating");
define("_AM_NEWBB_VOTE_DATE", "Submitted");
define("_AM_NEWBB_VOTE_RATING", "Rating");
define("_AM_NEWBB_VOTE_NOREGVOTES", "No Registered User Votes");
define("_AM_NEWBB_VOTE_NOUNREGVOTES", "No Unregistered User Votes");
-define("_AM_NEWBB_VOTEDELETED", "Vote data deleted.");
+define("_AM_NEWBB_VOTEDELETED", "Voting data deleted.");
define("_AM_NEWBB_VOTE_ID", "ID");
define("_AM_NEWBB_VOTE_FILETITLE", "Thread Title");
define("_AM_NEWBB_VOTE_DISPLAYVOTES", "Voting Data Information");
define("_AM_NEWBB_VOTE_NOVOTES", "No User Votes to display");
define("_AM_NEWBB_VOTE_DELETE", "No User Votes to delete");
-define("_AM_NEWBB_VOTE_DELETEDSC", "<strong>Deletes</strong> the chosen vote information from the database.");
+define("_AM_NEWBB_VOTE_DELETEDSC", "<strong>Deletes</strong> the selected voting information from the database.");
// admin_type_manager.php
define("_AM_NEWBB_TYPE_ADD", "Add types");
@@ -276,7 +276,7 @@
define("_AM_NEWBB_TYPE_ORDER", "Order");
define("_AM_NEWBB_TYPE_LIST", "Type list");
define("_AM_NEWBB_TODEL_TYPE", "Are you sure to delete the types: [%s]?");
-define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save them.");
+define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save it.");
define("_AM_NEWBB_TYPE_ORDER_DESC", "To activate a type for a forum, a value greater than 0 is required for 'type_order'; In other words, a type will be inactive for a forum if 'type_order' is set to 0.");
// admin_synchronization.php
@@ -287,11 +287,11 @@
define("_AM_NEWBB_SYNC_TYPE_STATS", "Stats Info");
define("_AM_NEWBB_SYNC_TYPE_MISC", "MISC");
define("_AM_NEWBB_SYNC_ITEMS", "Items for each loop: ");
-define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Thread prefixes allow?");
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Allow Thread prefixes?");
define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX_DESC", "This allows for prefixes that are added to the topic name.");
-define("_AM_NEWBB_GROUPMOD_TITLE","add moderators per group");
+define("_AM_NEWBB_GROUPMOD_TITLE","Add moderators per group");
define("_AM_NEWBB_GROUPMOD_TITLEDESC","Allows you to enter, users of certain groups as moderators");
-define("_AM_NEWBB_GROUPMOD_ALLFORUMS","all forums");
+define("_AM_NEWBB_GROUPMOD_ALLFORUMS","All forums");
define("_AM_NEWBB_GROUPMOD_ADDMOD","Moderators have been successfully registered.");
-define("_AM_NEWBB_GROUPMOD_ERRMOD","You have a Error!");
+define("_AM_NEWBB_GROUPMOD_ERRMOD","You have an Error!");
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-25 18:55:23
|
Revision: 9719
http://xoops.svn.sourceforge.net/xoops/?rev=9719&view=rev
Author: dhcst
Date: 2012-06-25 18:55:17 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
fix error in topicmanager
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-25 18:06:58 UTC (rev 9718)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-25 18:55:17 UTC (rev 9719)
@@ -7,7 +7,7 @@
//%%%%%% File Name index.php %%%%%
define("_AM_NEWBB_FORUMCONF", "Forum Configuration");
define("_AM_NEWBB_ADDAFORUM", "Add a Forum");
-define("_AM_NEWBB_SYNCFORUM", "Sync Forum");
+define("_AM_NEWBB_SYNCFORUM", "Sync forum");
define("_AM_NEWBB_REORDERFORUM", "Reorder");
define("_AM_NEWBB_FORUM_MANAGER", "Forums");
define("_AM_NEWBB_PRUNE_TITLE", "Prune");
@@ -35,12 +35,12 @@
define("_AM_NEWBB_POSTSAVED", "Post has been saved");
define("_AM_NEWBB_POSTNOTSAVED", "Post has NOT been saved");
define("_AM_NEWBB_TOPICAPPROVED", "Topic has been approved");
-define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has NOT been approved");
+define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has been NOT approved");
define("_AM_NEWBB_TOPICID", "Topic ID");
define("_AM_NEWBB_ORPHAN_TOPICS_FOR_AUTH", "Unapproved topics authorization");
-define('_AM_NEWBB_DEL_ONE','Delete only this post');
+define('_AM_NEWBB_DEL_ONE','Delete only this message');
define('_AM_NEWBB_POSTSDELETED','Selected post deleted.');
-define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting for approval.');
+define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting approval.');
define('_AM_NEWBB_SUBJECTC','Subject:');
define('_AM_NEWBB_MESSAGEICON','Message Icon:');
define('_AM_NEWBB_MESSAGEC','Message:');
@@ -57,12 +57,12 @@
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
-define('_AM_NEWBB_ATTACHPATH','Path for attachment storage');
+define('_AM_NEWBB_ATTACHPATH','Path for attachment storing');
define('_AM_NEWBB_THUMBPATH','Path for attached image thumbs');
//define('_AM_NEWBB_RSSPATH','Path for RSS feed');
define('_AM_NEWBB_REPORT','Reported posts');
define('_AM_NEWBB_REPORT_PENDING','Pending report');
-define('_AM_NEWBB_REPORT_PROCESSED','Processed report');
+define('_AM_NEWBB_REPORT_PROCESSED','processed report');
define('_AM_NEWBB_CREATETHEDIR','Create it');
define('_AM_NEWBB_SETMPERM','Set the permission');
define('_AM_NEWBB_DIRCREATED','The directory has been created');
@@ -91,7 +91,7 @@
define("_AM_NEWBB_EDITTHISFORUM", "Editing Forum:");
define("_AM_NEWBB_SET_FORUMORDER", "Set Forum Position:");
define("_AM_NEWBB_ALLOWPOLLS", "Allow Polls:");
-define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in KB`s:");
+define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in kb`s:");
define("_AM_NEWBB_ALLOWED_EXTENSIONS", "Allowed Extensions:<span style='font-size: xx-small; font-weight: normal; display: block;'>'*' indicates no limititations.<br /> Extensions delimited by '|'</span>");
define("_AM_NEWBB_ALLOW_ATTACHMENTS", "Allow Attachments:");
define("_AM_NEWBB_ALLOWHTML", "Allow HTML:");
@@ -156,8 +156,8 @@
define("_AM_NEWBB_REORDERID", "ID");
define("_AM_NEWBB_REORDERTITLE", "Title");
define("_AM_NEWBB_REORDERWEIGHT", "Position");
-define("_AM_NEWBB_SETFORUMORDER", "Set Forum Ordering");
-define("_AM_NEWBB_BOARDREORDER", "The Forum has been reordered to your specification");
+define("_AM_NEWBB_SETFORUMORDER", "Set Board Ordering");
+define("_AM_NEWBB_BOARDREORDER", "The Board has reordered to your specification");
// admin_permission.php
define("_AM_NEWBB_PERMISSIONS_TO_THIS_FORUM", "Topic permissions for this Forum");
@@ -192,7 +192,7 @@
define ("_AM_NEWBB_PRUNE_RESULTS_POSTS", "Pruned Posts");
define ("_AM_NEWBB_PRUNE_RESULTS_FORUMS", "Pruned Forums");
define ("_AM_NEWBB_PRUNE_STORE", "Store posts in this forum instead of deleting them");
-define ("_AM_NEWBB_PRUNE_ARCHIVE", "Save a copy of posts to Archive");
+define ("_AM_NEWBB_PRUNE_ARCHIVE", "Make a copy of posts into Archive");
define ("_AM_NEWBB_PRUNE_FORUMSELERROR", "You forgot to select forum(s) to prune");
define ("_AM_NEWBB_PRUNE_DAYS", "Remove topics without replies in:");
define ("_AM_NEWBB_PRUNE_FORUMS", "Forums to be pruned");
@@ -213,7 +213,7 @@
define ("_AM_NEWBB_PRUNE_2YEARS", "2 Years");
// About.php constants
-define('_AM_NEWBB_AUTHOR_INFO', "Author Information");
+define('_AM_NEWBB_AUTHOR_INFO', "Author Informations");
define('_AM_NEWBB_AUTHOR_NAME', "Author");
define('_AM_NEWBB_AUTHOR_WEBSITE', "Author's website");
define('_AM_NEWBB_AUTHOR_EMAIL', "Author's email");
@@ -236,7 +236,7 @@
define("_AM_NEWBB_PROCESSREPORT", "View new reports");
define("_AM_NEWBB_REPORTTITLE", "Report title");
define("_AM_NEWBB_REPORTEXTRA", "Extra");
-define("_AM_NEWBB_REPORTPOST", "Report post");
+define("_AM_NEWBB_REPORTPOST", "Reported post");
define("_AM_NEWBB_REPORTTEXT", "Report text");
define("_AM_NEWBB_REPORTMEMO", "Process memo");
@@ -252,18 +252,18 @@
define("_AM_NEWBB_VOTE_USER", "User");
define("_AM_NEWBB_VOTE_IP", "IP Address");
define("_AM_NEWBB_VOTE_USERAVG", "Average User Rating");
-define("_AM_NEWBB_VOTE_TOTALRATE", "Total Rating");
+define("_AM_NEWBB_VOTE_TOTALRATE", "Total Ratings");
define("_AM_NEWBB_VOTE_DATE", "Submitted");
define("_AM_NEWBB_VOTE_RATING", "Rating");
define("_AM_NEWBB_VOTE_NOREGVOTES", "No Registered User Votes");
define("_AM_NEWBB_VOTE_NOUNREGVOTES", "No Unregistered User Votes");
-define("_AM_NEWBB_VOTEDELETED", "Voting data deleted.");
+define("_AM_NEWBB_VOTEDELETED", "Vote data deleted.");
define("_AM_NEWBB_VOTE_ID", "ID");
define("_AM_NEWBB_VOTE_FILETITLE", "Thread Title");
define("_AM_NEWBB_VOTE_DISPLAYVOTES", "Voting Data Information");
define("_AM_NEWBB_VOTE_NOVOTES", "No User Votes to display");
define("_AM_NEWBB_VOTE_DELETE", "No User Votes to delete");
-define("_AM_NEWBB_VOTE_DELETEDSC", "<strong>Deletes</strong> the selected voting information from the database.");
+define("_AM_NEWBB_VOTE_DELETEDSC", "<strong>Deletes</strong> the chosen vote information from the database.");
// admin_type_manager.php
define("_AM_NEWBB_TYPE_ADD", "Add types");
@@ -276,7 +276,7 @@
define("_AM_NEWBB_TYPE_ORDER", "Order");
define("_AM_NEWBB_TYPE_LIST", "Type list");
define("_AM_NEWBB_TODEL_TYPE", "Are you sure to delete the types: [%s]?");
-define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save it.");
+define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save them.");
define("_AM_NEWBB_TYPE_ORDER_DESC", "To activate a type for a forum, a value greater than 0 is required for 'type_order'; In other words, a type will be inactive for a forum if 'type_order' is set to 0.");
// admin_synchronization.php
@@ -287,11 +287,11 @@
define("_AM_NEWBB_SYNC_TYPE_STATS", "Stats Info");
define("_AM_NEWBB_SYNC_TYPE_MISC", "MISC");
define("_AM_NEWBB_SYNC_ITEMS", "Items for each loop: ");
-define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Allow Thread prefixes?");
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Thread prefixes allow?");
define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX_DESC", "This allows for prefixes that are added to the topic name.");
-define("_AM_NEWBB_GROUPMOD_TITLE","Add moderators per group");
+define("_AM_NEWBB_GROUPMOD_TITLE","add moderators per group");
define("_AM_NEWBB_GROUPMOD_TITLEDESC","Allows you to enter, users of certain groups as moderators");
-define("_AM_NEWBB_GROUPMOD_ALLFORUMS","All forums");
+define("_AM_NEWBB_GROUPMOD_ALLFORUMS","all forums");
define("_AM_NEWBB_GROUPMOD_ADDMOD","Moderators have been successfully registered.");
-define("_AM_NEWBB_GROUPMOD_ERRMOD","You have an Error!");
+define("_AM_NEWBB_GROUPMOD_ERRMOD","You have a Error!");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-25 18:06:58 UTC (rev 9718)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-25 18:55:17 UTC (rev 9719)
@@ -35,7 +35,7 @@
${$getint} = intval( @$_POST[$getint]);
}
foreach (array('topic_id') as $getint) {
- ${$getint} = @$_POST[$getint];
+ ${$getint} = intval(@$_POST[$getint]);
}
if (!is_array($topic_id)) $topic_id=array($topic_id);
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-25 18:07:04
|
Revision: 9718
http://xoops.svn.sourceforge.net/xoops/?rev=9718&view=rev
Author: beckmi
Date: 2012-06-25 18:06:58 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
fixing XOOPS URL link (Cesag)
Modified Paths:
--------------
XoopsModules/xforms/trunk/xforms/xoops_version.php
Modified: XoopsModules/xforms/trunk/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/xoops_version.php 2012-06-25 16:34:13 UTC (rev 9717)
+++ XoopsModules/xforms/trunk/xforms/xoops_version.php 2012-06-25 18:06:58 UTC (rev 9718)
@@ -20,7 +20,7 @@
//about
$modversion['release_date'] = '2012/06/25';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["module_status"] = "Final";
$modversion['min_php']='5.2';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-25 16:34:26
|
Revision: 9717
http://xoops.svn.sourceforge.net/xoops/?rev=9717&view=rev
Author: beckmi
Date: 2012-06-25 16:34:13 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Updating Trunk to 1.21 Final
Modified Paths:
--------------
XoopsModules/xforms/trunk/xforms/admin/about.php
XoopsModules/xforms/trunk/xforms/admin/admin_header.php
XoopsModules/xforms/trunk/xforms/admin/editelement.php
XoopsModules/xforms/trunk/xforms/admin/ele_text.php
XoopsModules/xforms/trunk/xforms/admin/ele_upload.php
XoopsModules/xforms/trunk/xforms/admin/ele_uploadimg.php
XoopsModules/xforms/trunk/xforms/admin/elements.php
XoopsModules/xforms/trunk/xforms/admin/index.php
XoopsModules/xforms/trunk/xforms/admin/menu.php
XoopsModules/xforms/trunk/xforms/class/elementrenderer.php
XoopsModules/xforms/trunk/xforms/class/elements.php
XoopsModules/xforms/trunk/xforms/class/forms.php
XoopsModules/xforms/trunk/xforms/include/form_execute.php
XoopsModules/xforms/trunk/xforms/language/english/admin.php
XoopsModules/xforms/trunk/xforms/language/english/modinfo.php
XoopsModules/xforms/trunk/xforms/xoops_version.php
Added Paths:
-----------
XoopsModules/xforms/trunk/xforms/admin/admin_footer.php
XoopsModules/xforms/trunk/xforms/admin/main.php
XoopsModules/xforms/trunk/xforms/docs/
XoopsModules/xforms/trunk/xforms/docs/changelog.txt
XoopsModules/xforms/trunk/xforms/docs/credits.txt
XoopsModules/xforms/trunk/xforms/docs/index.html
XoopsModules/xforms/trunk/xforms/docs/install.txt
XoopsModules/xforms/trunk/xforms/docs/lang_diff.txt
XoopsModules/xforms/trunk/xforms/docs/licence.txt
XoopsModules/xforms/trunk/xforms/docs/readme.txt
XoopsModules/xforms/trunk/xforms/language/english/help/
XoopsModules/xforms/trunk/xforms/language/english/help/help.html
XoopsModules/xforms/trunk/xforms/language/english/help/index.html
Removed Paths:
-------------
XoopsModules/xforms/trunk/xforms/admin/footer.php
XoopsModules/xforms/trunk/xforms/license.txt
Modified: XoopsModules/xforms/trunk/xforms/admin/about.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/about.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/about.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -1,36 +1,29 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-include 'admin_header.php';
-adminHtmlHeader();
-?>
-<img src="../images/xforms.png" alt="xforms" style="float: left; margin: 0 10px 5px 0;" />
-<h4 style="margin: 0;">xForms</h4>
-<p style="margin-top: 0;">
-Version <?=number_format($xoopsModule->getVar('version')/100, 2);?><br />
-Presented by <a href="http://www.dylian.melgert.net/software" target="_blank">FliX Software</a> <br />
-Copyright © 2009 Dylian Melgert
-<br clear="all" />
-</p>
+/**
+ * xForms module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+* @copyright The XOOPS Project (http://www.xoops.org)
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package xforms
+ * @since 2.5.0
+ * @author Mage, Mamba
+ * @version $Id $
+ **/
-<h4 style="margin: 0;">License</h4>
-<p style="margin-top: 0;">
-This software is licensed under the CC-GNU GPL.<br />
-<a href="http://creativecommons.org/licenses/GPL/2.0/" target="_blank">Commons Deed</a> |
-<a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">Legal Code</a>
-</p>
+include_once dirname(__FILE__) . '/admin_header.php';
-<h4 style="margin: 0;">Who to Contact</h4>
-<p style="margin-top: 0;">
-Whe have not yet created a support page.
-</p>
+xoops_cp_header();
-<h4 style="margin: 0;">Special thanks to</h4>
-<p style="margin: 0;">
-<a href="http://www.brandycoke.com/" target="_blank">Brandycoke Productions</a> for creating liaise, the module xforms is based on.
-</p>
+$aboutAdmin = new ModuleAdmin();
-<?php
-xoops_cp_footer();
-?>
\ No newline at end of file
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/xforms/trunk/xforms/admin/admin_footer.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/admin_footer.php (rev 0)
+++ XoopsModules/xforms/trunk/xforms/admin/admin_footer.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1,28 @@
+<?php
+/**
+ * xForms module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package:: xDirectory
+ * @subpackage:: admin
+ * @since: 2.5.0
+ * @author:: XOOPS Development Team
+ * @version:: $Id $
+**/
+
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
+
+xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/xforms/trunk/xforms/admin/admin_header.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/admin_header.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/admin_header.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -1,31 +1,51 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-include '../../../include/cp_header.php';
+/**
+ * XoopsPartners module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package:: XoopsPartners
+ * @subpackage:: admin
+ * @since:: 2.5.0
+ * @author:: XOOPS Team
+ * @version:: $Id $
+**/
+
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
include '../include/common.php';
-define('xforms_ADMIN_URL', xforms_URL.'admin/index.php');
+define('xforms_ADMIN_URL', xforms_URL.'admin/main.php');
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
-function adminHtmlHeader(){
- global $xoopsModule, $xoopsConfig;
- $langf = xforms_ROOT_PATH.'language/'.$xoopsConfig['language'].'/modinfo.php';
- if( file_exists($langf) ){
- include $langf;
- }else{
- include xforms_ROOT_PATH.'language/english/modinfo.php';
- }
- include 'menu.php';
- for( $i=0; $i<4; $i++ ){
- $links[$i] = array(0 => xforms_URL.$adminmenu[$i]['link'], 1 => $adminmenu[$i]['title']);
- }
- $links[] = array(0 => XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$xoopsModule->getVar('mid'), 1 => _PREFERENCES);
- $links[] = array(0=> xforms_URL.'admin/about.php', 1=> 'About');
- $admin_links = '<table class="outer" width="100%" cellspacing="1"><tr>';
- for( $i=0; $i<count($links); $i++ ){
- $admin_links .= '<td class="even" style="width: 20%; text-align: center;"><a href="'.$links[$i][0].'" accesskey="'.($i+1).'">'.$links[$i][1].'</a></td>';
- }
- $admin_links .= "</tr></table><br clear='all' />\n";
- xoops_cp_header();
- echo $admin_links;
-}
-?>
\ No newline at end of file
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+//if functions.php file exist
+require_once dirname(dirname(__FILE__)) . '/include/functions.php';
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+ }else{
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ }
\ No newline at end of file
Modified: XoopsModules/xforms/trunk/xforms/admin/editelement.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/editelement.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/editelement.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -30,7 +30,8 @@
switch($op){
case 'edit':
- adminHtmlHeader();
+ //adminHtmlHeader();
+ xoops_cp_header();
if( !empty($ele_id) ){
$element = $xforms_ele_mgr->get($ele_id);
$ele_type = $element->getVar('ele_type');
@@ -136,7 +137,8 @@
redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
}
if( empty($_POST['ok']) ){
- adminHtmlHeader();
+ //adminHtmlHeader();
+ xoops_cp_header();
xoops_confirm(array('op' => 'delete', 'ele_id' => $ele_id, 'form_id' => $form_id, 'ok' => 1), _THIS_PAGE, _AM_ELE_CONFIRM_DELETE);
}else{
$element = $xforms_ele_mgr->get($ele_id);
@@ -249,14 +251,17 @@
}
$element->setVar('ele_value', $value);
if( !$xforms_ele_mgr->insert($element) ){
- adminHtmlHeader();
+ //adminHtmlHeader();
+ xoops_cp_header();
echo $element->getHtmlErrors();
}else{
redirect_header(xforms_URL.'admin/elements.php?form_id='.$form_id, 0, _AM_DBUPDATED);
}
break;
default:
- adminHtmlHeader();
+ xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('editelement.php') ;
echo "<h4>"._AM_ELE_CREATE."</h4>
<ul>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=text'>"._AM_ELE_TEXT."</a></li>
@@ -272,7 +277,7 @@
;
break;
}
-include 'footer.php';
+include 'admin_footer.php';
xoops_cp_footer();
Modified: XoopsModules/xforms/trunk/xforms/admin/ele_text.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/ele_text.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/ele_text.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -8,7 +8,9 @@
$max = !empty($value[1]) ? intval($value[1]) : $xoopsModuleConfig['t_max'];
$size = new XoopsFormText(_AM_ELE_SIZE, 'ele_value[0]', 3, 3, $size);
$max = new XoopsFormText(_AM_ELE_MAX_LENGTH, 'ele_value[1]', 3, 3, $max);
-$default = new XoopsFormText(_AM_ELE_DEFAULT, 'ele_value[2]', 50, 255, $myts->htmlspecialchars($myts->stripSlashesGPC($value[2])));
+
+//$default = new XoopsFormText(_AM_ELE_DEFAULT, 'ele_value[2]', 50, 255, $myts->htmlspecialchars($myts->stripSlashesGPC($value[2])));
+$default = new XoopsFormText(_AM_ELE_DEFAULT, 'ele_value[2]', 50, 255, isset($value[2]) ? $myts->htmlspecialchars($myts->stripSlashesGPC($value[2])) : '');
$default->setDescription(_AM_ELE_TEXT_DESC);
$output->addElement($size, 1);
$output->addElement($max, 1);
Modified: XoopsModules/xforms/trunk/xforms/admin/ele_upload.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/ele_upload.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/ele_upload.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -5,7 +5,12 @@
if( !defined('xforms_ROOT_PATH') ){ exit(); }
$size = !empty($value[0]) ? intval($value[0]) : 0;
-$saveas = $value[3] != 1 ? 0 : 1;
+//$saveas = $value[3] != 1 ? 0 : 1;
+if (isset($value[3]) && $value[3] == 1) {
+ $saveas = $value[3];
+} else {
+ $saveas = 0;
+}
$size = new XoopsFormText(_AM_ELE_UPLOAD_MAXSIZE, 'ele_value[0]', 10, 20, $size);
$size->setDescription(_AM_ELE_UPLOAD_MAXSIZE_DESC.'<br />'._AM_ELE_UPLOAD_DESC_SIZE_NOLIMIT);
Modified: XoopsModules/xforms/trunk/xforms/admin/ele_uploadimg.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/ele_uploadimg.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/ele_uploadimg.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -7,7 +7,12 @@
$size = !empty($value[0]) ? intval($value[0]) : 0;
$ext = empty($ele_id) ? 'jpg|jpeg|gif|png|tif|tiff' : $value[1];
$mime = empty($ele_id) ? 'image/jpeg|image/pjpeg|image/png|image/x-png|image/gif|image/tiff' : $value[2];
-$saveas = $value[3] != 1 ? 0 : 1;
+//$saveas = $value[3] != 1 ? 0 : 1;
+if (isset($value[3]) && $value[3] == 1) {
+ $saveas = $value[3];
+} else {
+ $saveas = 0;
+}
$width = !empty($value[4]) ? intval($value[4]) : 0;
$height = !empty($value[5]) ? intval($value[5]) : 0;
Modified: XoopsModules/xforms/trunk/xforms/admin/elements.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/elements.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/elements.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -5,6 +5,8 @@
include 'admin_header.php';
$xforms_ele_mgr = xoops_getmodulehandler('elements');
include_once xforms_ROOT_PATH.'class/elementrenderer.php';
+global $indexAdmin;
+$indexAdmin = new ModuleAdmin();
define('_THIS_PAGE', xforms_URL.'admin/elements.php');
if( !isset($_POST['op']) || $_POST['op'] != 'save' ){
$form_id = isset($_GET['form_id']) ? intval($_GET['form_id']) : 0;
@@ -12,7 +14,10 @@
redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
}
$form = $xforms_form_mgr->get($form_id);
- adminHtmlHeader();
+
+ //adminHtmlHeader();
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('elements.php') ;
$jump = array();
$jump[0] = new XoopsFormSelect('', 'ele_type');
$jump[0]->addOptionArray(array('text' => _AM_ELE_TEXT,
@@ -72,10 +77,10 @@
echo '<td class="even" rowspan="2" align="center">'.$check_req->render()."</td>\n";
echo '<td class="even" rowspan="2" align="center">'.$text_order->render()."</td>\n";
echo '<td class="even" rowspan="2" align="center">'.$check_display->render().$hidden_id->render()."</td>\n";
- echo '<td class="even" nowrap="nowrap" rowspan="2">
- <ul><li><a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'">'._EDIT.'</a></li>
- <li><a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'&clone=1">'._CLONE.'</a></li>
- <li><a href="editelement.php?op=delete&ele_id='.$id.'&form_id='.$form_id.'">'._DELETE.'</a></li></ul></td>';
+ echo '<td class="even" align="center" nowrap="nowrap" rowspan="2">
+ <a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'"><img src='.$pathIcon16.'/edit.png title='._EDIT.'></a>
+ <a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'&clone=1"><img src='.$pathIcon16.'/editcopy.png title='._CLONE.'></a>
+ <a href="editelement.php?op=delete&ele_id='.$id.'&form_id='.$form_id.'"><img src='.$pathIcon16.'/delete.png title='._DELETE.'></a></td>';
echo '</tr>';
echo '<tr><td class="even" colspan="2">'.$ele_value->render()."</td>\n</tr>";
}
@@ -228,10 +233,12 @@
redirect_header(_THIS_PAGE.'?form_id='.$form_id, 0, _AM_DBUPDATED);
}
}else{
- adminHtmlHeader();
+ //adminHtmlHeader();
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('elements.php') ;
echo $error;
}
}
-include 'footer.php';
-xoops_cp_footer();
-?>
\ No newline at end of file
+include 'admin_footer.php';
+//xoops_cp_footer();
+//?>
\ No newline at end of file
Deleted: XoopsModules/xforms/trunk/xforms/admin/footer.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/footer.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/footer.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -1,16 +0,0 @@
-<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-$version = number_format($xoopsModule->getVar('version')/100, 2);
-$version = !substr($version, -1, 1) ? substr($version, 0, 3) : $version;
-
-$credits = "<div style='text-align: right; font-size: x-small; margin-top: 15px;'>Powered by <a href='about.php'>xForms ".$version."</a>";
-echo $credits;
-
-if(version_compare(XOOPS_VERSION, '2.3.0', '>=')){
- echo '<br /><span style="color: #F00;"><b>'._AM_XOOPS_VERSION_WRONG.'</b></span>';
-}
-
-echo '</div>';
-?>
\ No newline at end of file
Modified: XoopsModules/xforms/trunk/xforms/admin/index.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/index.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/index.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -1,278 +1,43 @@
-<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
-include 'admin_header.php';
-$myts = MyTextSanitizer::getInstance();
-$op = isset($_GET['op']) ? trim($_GET['op']) : 'list';
-$op = isset($_POST['op']) ? trim($_POST['op']) : $op;
-
-switch($op){
- case 'list':
- default:
- adminHtmlHeader();
- $criteria = new Criteria(1, 1);
- $criteria->setSort('form_order');
- $criteria->setOrder('ASC');
- if( $forms = $xforms_form_mgr->getObjects($criteria, 'admin_list') ){
- echo '<form action="'.xforms_ADMIN_URL.'" method="post">
- <table class="outer" cellspacing="1" width="100%">
- <tr><th colspan="5">'._AM_FORM_LISTING.'</th></tr>
- <tr>
- <td class="head" align="center">'._AM_ID.'</td>
- <td class="head" align="center">'._AM_FORM_ORDER.'<br />'._AM_FORM_ORDER_DESC.'</td>
- <td class="head" align="center">'._AM_FORM_TITLE.'</td>
- <td class="head" align="center">'._AM_FORM_SENDTO.'</td>
- <td class="head" align="center">'._AM_ACTION.'</td>
- </tr>';
- foreach( $forms as $f ){
- $id = $f->getVar('form_id');
- $order = new XoopsFormText('', 'order['.$id.']', 3, 2, $f->getVar('form_order'));
- $group_mgr = xoops_gethandler('group');
- $sendto = $f->getVar('form_send_to_group');
- if( false != $sendto && $group = $group_mgr->get($sendto) ){
- $sendto = $group->getVar('name');
- }else{
- $sendto = _AM_FORM_SENDTO_ADMIN;
- }
- $ids = new XoopsFormHidden('ids[]', $id);
- echo '
- <tr>
- <td class="odd" align="center">'.$id.'</td>
- <td class="even" align="center">'.$order->render().'</td>
- <td class="odd"><a target="_blank" href="'.xforms_URL.'?form_id='.$id.'">'.$f->getVar('form_title').'</a></td>
- <td class="odd" align="center">'.$sendto.'</td>
- <td class="odd"><ul>
- <li><a href="'.xforms_ADMIN_URL.'?op=edit&form_id='.$id.'">'
- ._AM_FORM_ACTION_EDITFORM.'</a></li>
- <li><a href="elements.php?form_id='.$id.'">'
- ._AM_FORM_ACTION_EDITELEMENT.'</a></li>
- <li><a href="'.xforms_ADMIN_URL.'?op=edit&clone=1&form_id='.$id.'">'
- ._AM_FORM_ACTION_CLONE.'</a></li>
- <li><a href="'.xforms_ADMIN_URL.'?op=delete&form_id='.$id.'">'
- ._DELETE.'</a></li>
- </ul>'.$ids->render().'</td>
- </tr>';
- }
- $submit = new XoopsFormButton('', 'submit', _AM_RESET_ORDER, 'submit');
- echo '
- <tr>
- <td class="foot"> </td>
- <td class="foot" align="center">'.$submit->render().'</td>
- <td class="foot" colspan="3"> </td>
- </tr>
- </table>';
- $hidden = new XoopsFormHidden('op', 'saveorder');
- echo $hidden->render()."\n</form>\n";
- }
- break;
-
- case 'edit':
- $clone = isset($_GET['clone']) ? intval($_GET['clone']) : false;
- $form_id = isset($_GET['form_id']) ? intval($_GET['form_id']) : 0;
- adminHtmlHeader();
- if( !empty($form_id) ){
- $form = $xforms_form_mgr->get($form_id);
- }else{
- $form = $xforms_form_mgr->create();
- }
-
- $text_form_title = new XoopsFormText(_AM_FORM_TITLE, 'form_title', 50, 255, $form->getVar('form_title', 'e'));
-
- $group_ids = $moduleperm_handler->getGroupIds($xforms_form_mgr->perm_name, $form_id, $xoopsModule->getVar('mid'));
- $select_form_group_perm = new XoopsFormSelectGroup(_AM_FORM_PERM, 'form_group_perm', true, $group_ids, 5, true);
-
- $select_form_send_method = new XoopsFormSelect(_AM_FORM_SEND_METHOD, 'form_send_method', $form->getVar('form_send_method'));
- $select_form_send_method->addOption('e', _AM_FORM_SEND_METHOD_MAIL);
- $select_form_send_method->addOption('p', _AM_FORM_SEND_METHOD_PM);
- $select_form_send_method->setDescription(_AM_FORM_SEND_METHOD_DESC);
-
- $select_form_send_to_group = new XoopsFormSelectGroup(_AM_FORM_SENDTO, 'form_send_to_group', false, $form->getVar('form_send_to_group'));
- $select_form_send_to_group->addOption('0', _AM_FORM_SENDTO_ADMIN);
-
- $select_form_delimiter = new XoopsFormSelect(_AM_FORM_DELIMETER, 'form_delimiter', $form->getVar('form_delimiter'));
- $select_form_delimiter->addOption('s', _AM_FORM_DELIMETER_SPACE);
- $select_form_delimiter->addOption('b', _AM_FORM_DELIMETER_BR);
-
- $text_form_order = new XoopsFormText(_AM_FORM_ORDER, 'form_order', 3, 2, $form->getVar('form_order'));
- $text_form_order->setDescription(_AM_FORM_ORDER_DESC);
-
- $submit_text = $form->getVar('form_submit_text');
- $text_form_submit_text = new XoopsFormText(_AM_FORM_SUBMIT_TEXT, 'form_submit_text', 50, 50, empty($submit_text) ? _SUBMIT : $submit_text);
-
- $tarea_form_desc = new XoopsFormDhtmlTextArea(_AM_FORM_DESC, 'form_desc', $form->getVar('form_desc', 'e'), 5);
- $tarea_form_desc->setDescription(_AM_FORM_DESC_DESC);
-
- $tarea_form_intro = new XoopsFormDhtmlTextArea(_AM_FORM_INTRO, 'form_intro', $form->getVar('form_intro', 'e'), 10);
- $tarea_form_intro->setDescription(_AM_FORM_INTRO_DESC);
-
- $text_form_whereto = new XoopsFormText(_AM_FORM_WHERETO, 'form_whereto', 50, 255, $form->getVar('form_whereto'));
- $text_form_whereto->setDescription(_AM_FORM_WHERETO_DESC);
-
- $hidden_op = new XoopsFormHidden('op', 'saveform');
- $submit = new XoopsFormButton('', 'submit', _AM_SAVE, 'submit');
- $submit1 = new XoopsFormButton('', 'submit', _AM_SAVE_THEN_ELEMENTS, 'submit');
- $tray = new XoopsFormElementTray('');
- $tray->addElement($submit);
- $tray->addElement($submit1);
-
- if( empty($form_id) ){
- $caption = _AM_FORM_NEW;
- }else{
- if( $clone ){
- $caption = sprintf(_AM_COPIED, $form->getVar('form_title'));
- $clone_form_id = new XoopsFormHidden('clone_form_id', $form_id);
- $text_form_title = new XoopsFormText(_AM_FORM_TITLE, 'form_title', 50, 255, sprintf(_AM_COPIED, $form->getVar('form_title', 'e')));
- }else{
- $caption = sprintf(_AM_FORM_EDIT, $form->getVar('form_title'));
- $hidden_form_id = new XoopsFormHidden('form_id', $form_id);
- }
- }
- $output = new XoopsThemeForm($caption, 'editform', xforms_ADMIN_URL);
- $output->addElement($text_form_title, true);
- $output->addElement($select_form_group_perm);
- $output->addElement($select_form_send_method);
- $output->addElement($select_form_send_to_group);
- $output->addElement($select_form_delimiter);
- $output->addElement($text_form_order);
- $output->addElement($text_form_submit_text, true);
- $output->addElement($tarea_form_desc);
- $output->addElement($tarea_form_intro);
- $output->addElement($text_form_whereto);
- $output->addElement($hidden_op);
- if( isset($hidden_form_id) && is_object($hidden_form_id) ){
- $output->addElement($hidden_form_id);
- }
- if( isset($clone_form_id) && is_object($clone_form_id) ){
- $output->addElement($clone_form_id);
- }
- $output->addElement($tray);
- $output->display();
- break;
-
- case 'delete':
- if( empty($_POST['ok']) ){
- adminHtmlHeader();
- xoops_confirm(array('op' => 'delete', 'form_id' => $_GET['form_id'], 'ok' => 1), xforms_ADMIN_URL, _AM_FORM_CONFIRM_DELETE);
- }else{
- $form_id = intval($_POST['form_id']);
- if( empty($form_id) ){
- redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
- }
- $form = $xforms_form_mgr->get($form_id);
- $xforms_form_mgr->delete($form);
- $xforms_ele_mgr = xoops_getmodulehandler('elements');
- $criteria = new Criteria('form_id', $form_id);
- $xforms_ele_mgr->deleteAll($criteria);
- $xforms_form_mgr->deleteFormPermissions($form_id);
- redirect_header(xforms_ADMIN_URL, 0, _AM_DBUPDATED);
- }
- break;
-
- case 'saveorder':
- if( !isset($_POST['ids']) || count($_POST['ids']) < 1 ){
- redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
- }
- extract($_POST);
- foreach( $ids as $id ){
- $form = $xforms_form_mgr->get($id);
- $form->setVar('form_order', $order[$id]);
- $xforms_form_mgr->insert($form);
- }
- redirect_header(xforms_ADMIN_URL, 0, _AM_DBUPDATED);
- break;
-
- case 'saveform':
- if( !isset($_POST['submit']) ){
- redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
- }
- $error = '';
- extract($_POST);
- if( !empty($form_id) ){
- $form = $xforms_form_mgr->get($form_id);
- }else{
- $form = $xforms_form_mgr->create();
- }
- $form->setVar('form_send_method', $form_send_method);
- $form->setVar('form_send_to_group', $form_send_to_group);
- $form->setVar('form_order', $form_order);
- $form->setVar('form_delimiter', $form_delimiter);
- $form->setVar('form_title', $form_title);
- $form->setVar('form_submit_text', $form_submit_text);
- $form->setVar('form_desc', $form_desc);
- $form->setVar('form_intro', $form_intro);
- $form->setVar('form_whereto', $form_whereto);
- if( !$ret = $xforms_form_mgr->insert($form) ){
- $error = $form->getHtmlErrors();
- }else{
- $xforms_form_mgr->deleteFormPermissions($ret);
- if( count($form_group_perm) > 0 ){
- $xforms_form_mgr->insertFormPermissions($ret, $form_group_perm);
- }
- if( !empty($clone_form_id) ){
- $xforms_ele_mgr = xoops_getmodulehandler('elements');
- $criteria = new Criteria('form_id', $clone_form_id);
- $count = $xforms_ele_mgr->getCount($criteria);
- if( $count > 0 ){
- $elements = $xforms_ele_mgr->getObjects($criteria);
- foreach( $elements as $e ){
- $cloned = $e->xoopsClone();
- $cloned->setVar('form_id', $ret);
- if( !$xforms_ele_mgr->insert($cloned) ){
- $error .= $cloned->getHtmlErrors();
- }
- }
- }
- }elseif( empty($form_id) ){
- $xforms_ele_mgr = xoops_getmodulehandler('elements');
- $error = $xforms_ele_mgr->insertDefaults($ret);
- }
- }
- if( !empty($error) ){
- adminHtmlHeader();
- echo $error;
- }else{
- if( $_POST['submit'] == _AM_SAVE_THEN_ELEMENTS ){
- redirect_header(xforms_URL.'admin/elements.php?form_id='.$ret, 0, _AM_DBUPDATED);
- }else{
- redirect_header(xforms_ADMIN_URL.'?op=edit&form_id='.$ret, 0, _AM_DBUPDATED);
- }
- }
- break;
-
- case 'liaise_import':
- adminHtmlHeader();
- //include(XOOPS_ROOT_PATH."/modules/xforms/admin/liaise_import.php");
- if(file_exists(XOOPS_ROOT_PATH."/modules/liaise/xoops_version.php")){
- $sql = array();
- $sql[0] = "DROP TABLE `".$xoopsDB -> prefix( 'xforms_formelements' )."`;";
- $sql[1] = "CREATE TABLE ".$xoopsDB -> prefix( 'xforms_formelements' )." LIKE ".$xoopsDB -> prefix( 'liaise_formelements' ).";";
- $sql[2] = "INSERT ".$xoopsDB -> prefix( 'xforms_formelements' )." SELECT * FROM ".$xoopsDB -> prefix( 'liaise_formelements' ).";";
- $sql[3] = "DROP TABLE `".$xoopsDB -> prefix( 'xforms_forms' )."`;";
- $sql[4] = "CREATE TABLE ".$xoopsDB -> prefix( 'xforms_forms' )." LIKE ".$xoopsDB -> prefix( 'liaise_forms' ).";";
- $sql[5] = "INSERT ".$xoopsDB -> prefix( 'xforms_forms' )." SELECT * FROM ".$xoopsDB -> prefix( 'liaise_forms' ).";";
-
- $number = count($sql);
- for( $i=0; $i<count($sql); $i++ ){
- if(false == $xoopsDB->queryF($sql[$i])) {
- echo 'ERROR: '.$xoopsDB->error().' ('.$xoopsDB->errno().')<br />';
- $number--;
- /*}else{
- echo 'The query "'.$sql[$i].'" is executed...<br />';*/
- }
- }
-
- If ($number == count($sql)) {
- echo '<br /><strong>'._AM_IMPORT_SUCCES.'</strong>';
- }else{
- echo '<br /><strong>'._AM_IMPORT_FAILED.'</strong>';
- }
- }else{
- echo _AM_IMPORT_NFND;
- }
- break;
-}
-
-include 'footer.php';
-xoops_cp_footer();
-?>
\ No newline at end of file
+<?php
+// $Id$
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// 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. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Hacks provided by: Adam Frick //
+// e-mail: afr...@ya... //
+// Purpose: Create a yellow-page like business directory for xoops using //
+// the mylinks module as the foundation. //
+// ------------------------------------------------------------------------- //
+
+require_once '../../../include/cp_header.php';
+include_once 'admin_header.php';
+
+xoops_cp_header();
+
+ $index_admin = new ModuleAdmin();
+ echo $index_admin->addNavigation('index.php') ;
+ echo $index_admin->renderIndex();
+
+
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/xforms/trunk/xforms/admin/main.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/main.php (rev 0)
+++ XoopsModules/xforms/trunk/xforms/admin/main.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1,284 @@
+<?php
+###############################################################################
+## See license.txt ##
+###############################################################################
+include 'admin_header.php';
+$myts = MyTextSanitizer::getInstance();
+$op = isset($_GET['op']) ? trim($_GET['op']) : 'list';
+$op = isset($_POST['op']) ? trim($_POST['op']) : $op;
+
+switch($op){
+ case 'list':
+ default:
+ xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('main.php') ;
+ $criteria = new Criteria(1, 1);
+ $criteria->setSort('form_order');
+ $criteria->setOrder('ASC');
+ if( $forms = $xforms_form_mgr->getObjects($criteria, 'admin_list') ){
+ echo '<form action="'.xforms_ADMIN_URL.'" method="post">
+ <table class="outer" cellspacing="1" width="100%">
+ <tr><th colspan="5">'._AM_FORM_LISTING.'</th></tr>
+ <tr>
+ <td class="head" align="center">'._AM_ID.'</td>
+ <td class="head" align="center">'._AM_FORM_ORDER.'<br />'._AM_FORM_ORDER_DESC.'</td>
+ <td class="head" align="center">'._AM_FORM_TITLE.'</td>
+ <td class="head" align="center">'._AM_FORM_SENDTO.'</td>
+ <td class="head" align="center">'._AM_ACTION.'</td>
+ </tr>';
+ foreach( $forms as $f ){
+ $id = $f->getVar('form_id');
+ $order = new XoopsFormText('', 'order['.$id.']', 3, 2, $f->getVar('form_order'));
+ $group_mgr = xoops_gethandler('group');
+ $sendto = $f->getVar('form_send_to_group');
+ if( false != $sendto && $group = $group_mgr->get($sendto) ){
+ $sendto = $group->getVar('name');
+ }else{
+ $sendto = _AM_FORM_SENDTO_ADMIN;
+ }
+ $ids = new XoopsFormHidden('ids[]', $id);
+ echo '
+ <tr>
+ <td class="odd" align="center">'.$id.'</td>
+ <td class="even" align="center">'.$order->render().'</td>
+ <td class="odd"><a target="_blank" href="'.xforms_URL.'?form_id='.$id.'">'.$f->getVar('form_title').'</a></td>
+ <td class="odd" align="center">'.$sendto.'</td>
+ <td class="odd" align="center">
+ <a href="'.xforms_ADMIN_URL.'?op=edit&form_id='.$id.'"><img src='.$pathIcon16.'/edit.png title='._AM_FORM_ACTION_EDITFORM.'alt='._AM_FORM_ACTION_EDITFORM.'></a>
+ <a href="'.'elements.php?form_id='.$id.'"><img src='.$pathIcon16.'/1day.png title='._AM_FORM_ACTION_EDITELEMENT.'alt='._AM_FORM_ACTION_EDITELEMENT.'></a>
+ <a href="'.xforms_ADMIN_URL.'?op=edit&clone=1&form_id='.$id.'"><img src='.$pathIcon16.'/editcopy.png title='._AM_FORM_ACTION_CLONE.'alt='._AM_FORM_ACTION_CLONE.'></a>
+
+ <a href="'.xforms_ADMIN_URL.'?op=delete&form_id='.$id.'"><img src='.$pathIcon16.'/delete.png title='._DELETE.' alt='._DELETE.'></a>'.$ids->render()
+ .'</td>
+ </tr>';
+ }
+ $submit = new XoopsFormButton('', 'submit', _AM_RESET_ORDER, 'submit');
+ echo '
+ <tr>
+ <td class="foot"> </td>
+ <td class="foot" align="center">'.$submit->render().'</td>
+ <td class="foot" colspan="3"> </td>
+ </tr>
+ </table>';
+ $hidden = new XoopsFormHidden('op', 'saveorder');
+ echo $hidden->render()."\n</form>\n";
+ }
+ break;
+
+ case 'edit':
+ $clone = isset($_GET['clone']) ? intval($_GET['clone']) : false;
+ $form_id = isset($_GET['form_id']) ? intval($_GET['form_id']) : 0;
+ xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('main.php?op=edit') ;
+ if( !empty($form_id) ){
+ $form = $xforms_form_mgr->get($form_id);
+ }else{
+ $form = $xforms_form_mgr->create();
+ }
+
+ $text_form_title = new XoopsFormText(_AM_FORM_TITLE, 'form_title', 50, 255, $form->getVar('form_title', 'e'));
+
+ $group_ids = $moduleperm_handler->getGroupIds($xforms_form_mgr->perm_name, $form_id, $xoopsModule->getVar('mid'));
+ $select_form_group_perm = new XoopsFormSelectGroup(_AM_FORM_PERM, 'form_group_perm', true, $group_ids, 5, true);
+
+ $select_form_send_method = new XoopsFormSelect(_AM_FORM_SEND_METHOD, 'form_send_method', $form->getVar('form_send_method'));
+ $select_form_send_method->addOption('e', _AM_FORM_SEND_METHOD_MAIL);
+ $select_form_send_method->addOption('p', _AM_FORM_SEND_METHOD_PM);
+ $select_form_send_method->setDescription(_AM_FORM_SEND_METHOD_DESC);
+
+ $select_form_send_to_group = new XoopsFormSelectGroup(_AM_FORM_SENDTO, 'form_send_to_group', false, $form->getVar('form_send_to_group'));
+ $select_form_send_to_group->addOption('0', _AM_FORM_SENDTO_ADMIN);
+
+ $select_form_delimiter = new XoopsFormSelect(_AM_FORM_DELIMETER, 'form_delimiter', $form->getVar('form_delimiter'));
+ $select_form_delimiter->addOption('s', _AM_FORM_DELIMETER_SPACE);
+ $select_form_delimiter->addOption('b', _AM_FORM_DELIMETER_BR);
+
+ $text_form_order = new XoopsFormText(_AM_FORM_ORDER, 'form_order', 3, 2, $form->getVar('form_order'));
+ $text_form_order->setDescription(_AM_FORM_ORDER_DESC);
+
+ $submit_text = $form->getVar('form_submit_text');
+ $text_form_submit_text = new XoopsFormText(_AM_FORM_SUBMIT_TEXT, 'form_submit_text', 50, 50, empty($submit_text) ? _SUBMIT : $submit_text);
+
+ $tarea_form_desc = new XoopsFormDhtmlTextArea(_AM_FORM_DESC, 'form_desc', $form->getVar('form_desc', 'e'), 5);
+ $tarea_form_desc->setDescription(_AM_FORM_DESC_DESC);
+
+ $tarea_form_intro = new XoopsFormDhtmlTextArea(_AM_FORM_INTRO, 'form_intro', $form->getVar('form_intro', 'e'), 10);
+ $tarea_form_intro->setDescription(_AM_FORM_INTRO_DESC);
+
+ $text_form_whereto = new XoopsFormText(_AM_FORM_WHERETO, 'form_whereto', 50, 255, $form->getVar('form_whereto'));
+ $text_form_whereto->setDescription(_AM_FORM_WHERETO_DESC);
+
+ $hidden_op = new XoopsFormHidden('op', 'saveform');
+ $submit = new XoopsFormButton('', 'submit', _AM_SAVE, 'submit');
+ $submit1 = new XoopsFormButton('', 'submit', _AM_SAVE_THEN_ELEMENTS, 'submit');
+ $tray = new XoopsFormElementTray('');
+ $tray->addElement($submit);
+ $tray->addElement($submit1);
+
+ if( empty($form_id) ){
+ $caption = _AM_FORM_NEW;
+ }else{
+ if( $clone ){
+ $caption = sprintf(_AM_COPIED, $form->getVar('form_title'));
+ $clone_form_id = new XoopsFormHidden('clone_form_id', $form_id);
+ $text_form_title = new XoopsFormText(_AM_FORM_TITLE, 'form_title', 50, 255, sprintf(_AM_COPIED, $form->getVar('form_title', 'e')));
+ }else{
+ $caption = sprintf(_AM_FORM_EDIT, $form->getVar('form_title'));
+ $hidden_form_id = new XoopsFormHidden('form_id', $form_id);
+ }
+ }
+ $output = new XoopsThemeForm($caption, 'editform', xforms_ADMIN_URL);
+ $output->addElement($text_form_title, true);
+ $output->addElement($select_form_group_perm);
+ $output->addElement($select_form_send_method);
+ $output->addElement($select_form_send_to_group);
+ $output->addElement($select_form_delimiter);
+ $output->addElement($text_form_order);
+ $output->addElement($text_form_submit_text, true);
+ $output->addElement($tarea_form_desc);
+ $output->addElement($tarea_form_intro);
+ $output->addElement($text_form_whereto);
+ $output->addElement($hidden_op);
+ if( isset($hidden_form_id) && is_object($hidden_form_id) ){
+ $output->addElement($hidden_form_id);
+ }
+ if( isset($clone_form_id) && is_object($clone_form_id) ){
+ $output->addElement($clone_form_id);
+ }
+ $output->addElement($tray);
+ $output->display();
+ break;
+
+ case 'delete':
+ if( empty($_POST['ok']) ){
+ //adminHtmlHeader();
+ xoops_cp_header();
+ xoops_confirm(array('op' => 'delete', 'form_id' => $_GET['form_id'], 'ok' => 1), xforms_ADMIN_URL, _AM_FORM_CONFIRM_DELETE);
+ }else{
+ $form_id = intval($_POST['form_id']);
+ if( empty($form_id) ){
+ redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
+ }
+ $form = $xforms_form_mgr->get($form_id);
+ $xforms_form_mgr->delete($form);
+ $xforms_ele_mgr = xoops_getmodulehandler('elements');
+ $criteria = new Criteria('form_id', $form_id);
+ $xforms_ele_mgr->deleteAll($criteria);
+ $xforms_form_mgr->deleteFormPermissions($form_id);
+ redirect_header(xforms_ADMIN_URL, 0, _AM_DBUPDATED);
+ }
+ break;
+
+ case 'saveorder':
+ if( !isset($_POST['ids']) || count($_POST['ids']) < 1 ){
+ redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
+ }
+ extract($_POST);
+ foreach( $ids as $id ){
+ $form = $xforms_form_mgr->get($id);
+ $form->setVar('form_order', $order[$id]);
+ $xforms_form_mgr->insert($form);
+ }
+ redirect_header(xforms_ADMIN_URL, 0, _AM_DBUPDATED);
+ break;
+
+ case 'saveform':
+ if( !isset($_POST['submit']) ){
+ redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
+ }
+ $error = '';
+ extract($_POST);
+ if( !empty($form_id) ){
+ $form = $xforms_form_mgr->get($form_id);
+ }else{
+ $form = $xforms_form_mgr->create();
+ }
+ $form->setVar('form_send_method', $form_send_method);
+ $form->setVar('form_send_to_group', $form_send_to_group);
+ $form->setVar('form_order', $form_order);
+ $form->setVar('form_delimiter', $form_delimiter);
+ $form->setVar('form_title', $form_title);
+ $form->setVar('form_submit_text', $form_submit_text);
+ $form->setVar('form_desc', $form_desc);
+ $form->setVar('form_intro', $form_intro);
+ $form->setVar('form_whereto', $form_whereto);
+ if( !$ret = $xforms_form_mgr->insert($form) ){
+ $error = $form->getHtmlErrors();
+ }else{
+ $xforms_form_mgr->deleteFormPermissions($ret);
+ if( count($form_group_perm) > 0 ){
+ $xforms_form_mgr->insertFormPermissions($ret, $form_group_perm);
+ }
+ if( !empty($clone_form_id) ){
+ $xforms_ele_mgr = xoops_getmodulehandler('elements');
+ $criteria = new Criteria('form_id', $clone_form_id);
+ $count = $xforms_ele_mgr->getCount($criteria);
+ if( $count > 0 ){
+ $elements = $xforms_ele_mgr->getObjects($criteria);
+ foreach( $elements as $e ){
+ $cloned = $e->xoopsClone();
+ $cloned->setVar('form_id', $ret);
+ if( !$xforms_ele_mgr->insert($cloned) ){
+ $error .= $cloned->getHtmlErrors();
+ }
+ }
+ }
+ }elseif( empty($form_id) ){
+ $xforms_ele_mgr = xoops_getmodulehandler('elements');
+ $error = $xforms_ele_mgr->insertDefaults($ret);
+ }
+ }
+ if( !empty($error) ){
+ //adminHtmlHeader();
+ xoops_cp_header();
+ echo $error;
+ }else{
+ if( $_POST['submit'] == _AM_SAVE_THEN_ELEMENTS ){
+ redirect_header(xforms_URL.'admin/elements.php?form_id='.$ret, 0, _AM_DBUPDATED);
+ }else{
+ redirect_header(xforms_ADMIN_URL.'?op=edit&form_id='.$ret, 0, _AM_DBUPDATED);
+ }
+ }
+ break;
+
+ case 'liaise_import':
+ xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('main.php?op=liaise_import');
+
+ //include(XOOPS_ROOT_PATH."/modules/xforms/admin/liaise_import.php");
+ if(file_exists(XOOPS_ROOT_PATH."/modules/liaise/xoops_version.php")){
+ $sql = array();
+ $sql[0] = "DROP TABLE `".$xoopsDB -> prefix( 'xforms_formelements' )."`;";
+ $sql[1] = "CREATE TABLE ".$xoopsDB -> prefix( 'xforms_formelements' )." LIKE ".$xoopsDB -> prefix( 'liaise_formelements' ).";";
+ $sql[2] = "INSERT ".$xoopsDB -> prefix( 'xforms_formelements' )." SELECT * FROM ".$xoopsDB -> prefix( 'liaise_formelements' ).";";
+ $sql[3] = "DROP TABLE `".$xoopsDB -> prefix( 'xforms_forms' )."`;";
+ $sql[4] = "CREATE TABLE ".$xoopsDB -> prefix( 'xforms_forms' )." LIKE ".$xoopsDB -> prefix( 'liaise_forms' ).";";
+ $sql[5] = "INSERT ".$xoopsDB -> prefix( 'xforms_forms' )." SELECT * FROM ".$xoopsDB -> prefix( 'liaise_forms' ).";";
+
+ $number = count($sql);
+ for( $i=0; $i<count($sql); $i++ ){
+ if(false == $xoopsDB->queryF($sql[$i])) {
+ echo 'ERROR: '.$xoopsDB->error().' ('.$xoopsDB->errno().')<br />';
+ $number--;
+ /*}else{
+ echo 'The query "'.$sql[$i].'" is executed...<br />';*/
+ }
+ }
+
+ If ($number == count($sql)) {
+ echo '<br /><strong>'._AM_IMPORT_SUCCES.'</strong>';
+ }else{
+ echo '<br /><strong>'._AM_IMPORT_FAILED.'</strong>';
+ }
+ }else{
+ echo _AM_IMPORT_NFND;
+ }
+ break;
+}
+
+include 'admin_footer.php';
+xoops_cp_footer();
+?>
\ No newline at end of file
Modified: XoopsModules/xforms/trunk/xforms/admin/menu.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/menu.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/admin/menu.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -27,12 +27,34 @@
## along with this program; if not, write to the Free Software ##
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ##
###############################################################################
-$adminmenu[0]['title'] = _MI_xforms_ADMENU1;
-$adminmenu[0]['link'] = "admin/index.php";
-$adminmenu[1]['title'] = _MI_xforms_ADMENU2;
-$adminmenu[1]['link'] = "admin/index.php?op=edit";
-$adminmenu[2]['title'] = _MI_xforms_ADMENU3;
-$adminmenu[2]['link'] = "admin/editelement.php";
-$adminmenu[3]['title'] = _MI_xforms_ADMENU4;
-$adminmenu[3]['link'] = "admin/index.php?op=liaise_import";
-?>
\ No newline at end of file
+$module_handler =& xoops_gethandler('module');
+$xoopsModule =& XoopsModule::getByDirname('xforms');
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon32 = $moduleInfo->getInfo('icons32');
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]['title'] = _MI_xforms_ADMENU0 ;
+$adminmenu[$i]['link'] = 'admin/index.php' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ;
+$i++;
+$adminmenu[$i]['title'] = _MI_xforms_ADMENU1 ;
+$adminmenu[$i]['link'] = 'admin/main.php' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/manage.png' ;
+$i++;
+$adminmenu[$i]['title'] = _MI_xforms_ADMENU2 ;
+$adminmenu[$i]['link'] = 'admin/main.php?op=edit';
+$adminmenu[$i]['icon'] = $pathIcon32.'/add.png' ;
+$i++;
+$adminmenu[$i]['title'] = _MI_xforms_ADMENU3 ;
+$adminmenu[$i]['link'] = 'admin/editelement.php' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/insert_table_row.png' ;
+$i++;
+$adminmenu[$i]['title'] = _MI_xforms_ADMENU4 ;
+$adminmenu[$i]['link'] = 'admin/main.php?op=liaise_import' ;
+$adminmenu[$i]['icon'] = $pathIcon32.'/compfile.png' ;
+$i++;
+$adminmenu[$i]['title'] = _MI_xforms_ADMENU5;
+$adminmenu[$i]['link'] = "admin/about.php";
+$adminmenu[$i]['icon'] = $pathIcon32.'/about.png';
\ No newline at end of file
Modified: XoopsModules/xforms/trunk/xforms/class/elementrenderer.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/class/elementrenderer.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/class/elementrenderer.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -103,7 +103,7 @@
$form_ele = new XoopsFormElementTray($ele_caption, $delimiter == 'b' ? '<br />' : ' ');
while( $o = each($options) ){
- $t =& new XoopsFormCheckBox(
+ $t = new XoopsFormCheckBox(
'',
$form_ele_id.'[]',
$selected
@@ -141,7 +141,7 @@
case 'b':
$form_ele = new XoopsFormElementTray($ele_caption, '<br />');
while( $o = each($options) ){
- $t =& new XoopsFormRadio(
+ $t = new XoopsFormRadio(
'',
$form_ele_id,
$selected
Modified: XoopsModules/xforms/trunk/xforms/class/elements.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/class/elements.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/class/elements.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -19,12 +19,12 @@
}
}
-class xformsElementsHandler {
+class xformsElementsHandler extends XoopsPersistableObjectHandler{
var $db;
var $db_table;
var $obj_class = 'xformsElements';
- function xformsElementsHandler($db) {
+ function __construct($db) {
$this->db = $db;
$this->db_table = $this->db->prefix('xforms_formelements');
}
@@ -157,9 +157,9 @@
$elements = new $this->obj_class();
$elements->assignVars($myrow);
if( !$id_as_key ){
- $ret[] = &$elements;
+ $ret[] =& $elements;
}else{
- $ret[$myrow['ele_id']] = &$elements;
+ $ret[$myrow['ele_id']] =& $elements;
}
unset($elements);
}
Modified: XoopsModules/xforms/trunk/xforms/class/forms.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/class/forms.php 2012-06-25 16:26:38 UTC (rev 9716)
+++ XoopsModules/xforms/trunk/xforms/class/forms.php 2012-06-25 16:34:13 UTC (rev 9717)
@@ -22,13 +22,13 @@
}
}
-class xformsFormsHandler extends XoopsObjectHandler {
+class xformsFormsHandler extends XoopsPersistableObjectHandler {
var $db;
var $db_table;
var $perm_name = 'xforms_form_access';
var $obj_class = 'xformsForms';
- function xformsFormsHandler(&$db){
+ function __construct(&$db){
$this->db = $db;
$this->db_table = $this->db->prefix('xforms_forms');
}
Added: XoopsModules/xforms/trunk/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/changelog.txt (rev 0)
+++ XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1,13 @@
+1.21 Mamba (2011-07-18)
+=================================
+- fixing some bugs: (black_beard)
+- updated to the XOOPS 2.5.x Admin GUI (mamba)
+
+1.20 Dylian (2010-6-30
+=================================
+slight improvements
+
+1.00 Dylian (2009-6-29
+=================================
+- Original release of the clone of Liaiss
+
Added: XoopsModules/xforms/trunk/xforms/docs/credits.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/credits.txt (rev 0)
+++ XoopsModules/xforms/trunk/xforms/docs/credits.txt 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1,5 @@
+Credits
+===============
+Developed by Dylian Melgert (http://www.dylian.eu/) and based on Liaise module by Brandycoke Productions (http://www.brandycoke.com)
+
+Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba), with contributios by Gregory Mage (Mage)
Added: XoopsModules/xforms/trunk/xforms/docs/index.html
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/index.html (rev 0)
+++ XoopsModules/xforms/trunk/xforms/docs/index.html 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/xforms/trunk/xforms/docs/install.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/install.txt (rev 0)
+++ XoopsModules/xforms/trunk/xforms/docs/install.txt 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1,6 @@
+INSTALL/UNISTALL
+=================
+
+No special measures necessary, follow the standard installation process \x96 extract the /xforms folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+
+Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i)
\ No newline at end of file
Added: XoopsModules/xforms/trunk/xforms/docs/lang_diff.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/lang_diff.txt (rev 0)
+++ XoopsModules/xforms/trunk/xforms/docs/lang_diff.txt 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1,56 @@
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
+
+Version 1.11
+----------------
+admin.php
+----------
+Changed prefixes for defines from '_AM_' to _AM_XPARTNERS_'
+
+// About.php
+define("_AM_XPARTNERS_ABOUT_RELEASEDATE", "Released: ");
+define("_AM_XPARTNERS_ABOUT_UPDATEDATE", "Updated: ");
+define("_AM_XPARTNERS_ABOUT_AUTHOR", "Author: ");
+define("_AM_XPARTNERS_ABOUT_CREDITS", "Credits: ");
+define("_AM_XPARTNERS_ABOUT_LICENSE", "License: ");
+define("_AM_XPARTNERS_ABOUT_MODULE_STATUS", "Status: ");
+define("_AM_XPARTNERS_ABOUT_WEBSITE", "Website: ");
+define("_AM_XPARTNERS_ABOUT_AUTHOR_NAME", "Author name: ");
+define("_AM_XPARTNERS_ABOUT_CHANGELOG", "Change Log");
+define("_AM_XPARTNERS_ABOUT_MODULE_INFO", "Module Infos");
+define("_AM_XPARTNERS_ABOUT_AUTHOR_INFO", "Author Infos");
+define("_AM_XPARTNERS_ABOUT_DESCRIPTION", "Description: ");
+define("_AM_XPARTNERS_EMPTYDATABASE", "There is nothing to sort. Please add some Partners first!");
+
+define("_AM_XPARTNERS_ACTIONS", "Actions");
+define("_AM_XPARTNERS_INVALIDID", "No partner exists with this ID");
+
+Removed:
+_AM_EDIT
+_AM_DELETE
+
+blocks.php
+-----------
+Changed prefix of all defines from '_MB_' to '_MB_XPARTNERS_'
+
+help.php
+-----------
+New file with defines
+
+main.php
+-----------
+//file /admin/index.php
+define("_MD_XPARTNERS_DASHBOARD","Xoops Partner Dashboard");
+define("_MD_XPARTNERS_TOTALPARTNERS","Total Partners: <strong>%s</strong> ");
+define("_MD_XPARTNERS_TOTALACTIVE","Active Partners: <strong>%s</strong> ");
+define("_MD_XPARTNERS_TOTALNONACTIVE","Non-Active Partners: <strong>%s</strong> ");
+//define("_MD_XPARTNERS_TOTALPARTNERS","There are <strong>%s</strong> Active Partners in our Database");
+
+modinfo.php
+-------------
+// index.php
+define("_MI_XPARTNERS_MENU_01", "Home");
+define("_PARTNERS_ADMIN_ABOUT", "About");
+define("_PARTNERS_ADMIN_HELP", "Help");
\ No newline at end of file
Added: XoopsModules/xforms/trunk/xforms/docs/licence.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/licence.txt (rev 0)
+++ XoopsModules/xforms/trunk/xforms/docs/licence.txt 2012-06-25 16:34:13 UTC (rev 9717)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ doe...
[truncated message content] |
|
From: <be...@us...> - 2012-06-25 16:26:49
|
Revision: 9716
http://xoops.svn.sourceforge.net/xoops/?rev=9716&view=rev
Author: beckmi
Date: 2012-06-25 16:26:38 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Fixing deprecated target="blank" (kris_fr)
Fixing other bugs (black_beard)
Updating to 1.21 Final
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/about.php
XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_text.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_upload.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_uploadimg.php
XoopsModules/xforms/branches/mamba/xforms/admin/elements.php
XoopsModules/xforms/branches/mamba/xforms/admin/main.php
XoopsModules/xforms/branches/mamba/xforms/class/elements.php
XoopsModules/xforms/branches/mamba/xforms/class/forms.php
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/about.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/about.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/about.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -1,6 +1,6 @@
<?php
/**
- * XoopsPartners module
+ * xForms module
*
* 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
@@ -11,13 +11,13 @@
*
* @copyright The XOOPS Project (http://www.xoops.org)
* @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package XoopsPartners
+ * @package xforms
* @since 2.5.0
* @author Mage, Mamba
* @version $Id $
**/
- include_once dirname(__FILE__) . '/admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -20,9 +20,9 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
- ." " . _AM_XFORMS_FOOTER . "\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_text.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_text.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_text.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -8,7 +8,9 @@
$max = !empty($value[1]) ? intval($value[1]) : $xoopsModuleConfig['t_max'];
$size = new XoopsFormText(_AM_ELE_SIZE, 'ele_value[0]', 3, 3, $size);
$max = new XoopsFormText(_AM_ELE_MAX_LENGTH, 'ele_value[1]', 3, 3, $max);
-$default = new XoopsFormText(_AM_ELE_DEFAULT, 'ele_value[2]', 50, 255, $myts->htmlspecialchars($myts->stripSlashesGPC($value[2])));
+
+//$default = new XoopsFormText(_AM_ELE_DEFAULT, 'ele_value[2]', 50, 255, $myts->htmlspecialchars($myts->stripSlashesGPC($value[2])));
+$default = new XoopsFormText(_AM_ELE_DEFAULT, 'ele_value[2]', 50, 255, isset($value[2]) ? $myts->htmlspecialchars($myts->stripSlashesGPC($value[2])) : '');
$default->setDescription(_AM_ELE_TEXT_DESC);
$output->addElement($size, 1);
$output->addElement($max, 1);
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_upload.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_upload.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_upload.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -5,7 +5,12 @@
if( !defined('xforms_ROOT_PATH') ){ exit(); }
$size = !empty($value[0]) ? intval($value[0]) : 0;
-$saveas = $value[3] != 1 ? 0 : 1;
+//$saveas = $value[3] != 1 ? 0 : 1;
+if (isset($value[3]) && $value[3] == 1) {
+ $saveas = $value[3];
+} else {
+ $saveas = 0;
+}
$size = new XoopsFormText(_AM_ELE_UPLOAD_MAXSIZE, 'ele_value[0]', 10, 20, $size);
$size->setDescription(_AM_ELE_UPLOAD_MAXSIZE_DESC.'<br />'._AM_ELE_UPLOAD_DESC_SIZE_NOLIMIT);
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_uploadimg.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_uploadimg.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_uploadimg.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -7,7 +7,12 @@
$size = !empty($value[0]) ? intval($value[0]) : 0;
$ext = empty($ele_id) ? 'jpg|jpeg|gif|png|tif|tiff' : $value[1];
$mime = empty($ele_id) ? 'image/jpeg|image/pjpeg|image/png|image/x-png|image/gif|image/tiff' : $value[2];
-$saveas = $value[3] != 1 ? 0 : 1;
+//$saveas = $value[3] != 1 ? 0 : 1;
+if (isset($value[3]) && $value[3] == 1) {
+ $saveas = $value[3];
+} else {
+ $saveas = 0;
+}
$width = !empty($value[4]) ? intval($value[4]) : 0;
$height = !empty($value[5]) ? intval($value[5]) : 0;
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/elements.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -5,6 +5,8 @@
include 'admin_header.php';
$xforms_ele_mgr = xoops_getmodulehandler('elements');
include_once xforms_ROOT_PATH.'class/elementrenderer.php';
+global $indexAdmin;
+$indexAdmin = new ModuleAdmin();
define('_THIS_PAGE', xforms_URL.'admin/elements.php');
if( !isset($_POST['op']) || $_POST['op'] != 'save' ){
$form_id = isset($_GET['form_id']) ? intval($_GET['form_id']) : 0;
@@ -12,8 +14,10 @@
redirect_header(xforms_ADMIN_URL, 0, _AM_NOTHING_SELECTED);
}
$form = $xforms_form_mgr->get($form_id);
+
//adminHtmlHeader();
xoops_cp_header();
+ echo $indexAdmin->addNavigation('elements.php') ;
$jump = array();
$jump[0] = new XoopsFormSelect('', 'ele_type');
$jump[0]->addOptionArray(array('text' => _AM_ELE_TEXT,
@@ -231,9 +235,10 @@
}else{
//adminHtmlHeader();
xoops_cp_header();
+ echo $indexAdmin->addNavigation('elements.php') ;
echo $error;
}
}
include 'admin_footer.php';
-xoops_cp_footer();
-?>
\ No newline at end of file
+//xoops_cp_footer();
+//?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/main.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -45,15 +45,12 @@
<td class="odd"><a target="_blank" href="'.xforms_URL.'?form_id='.$id.'">'.$f->getVar('form_title').'</a></td>
<td class="odd" align="center">'.$sendto.'</td>
<td class="odd" align="center">
- <a href="'.xforms_ADMIN_URL.'?op=edit&form_id='.$id.'"><img src='.$pathIcon16.'/edit.png title='
- ._AM_FORM_ACTION_EDITFORM.'alt='._AM_FORM_ACTION_EDITFORM.'></a>
- <a href="elements.php?form_id='.$id.'"><img src='.$pathIcon16.'/1day.png title='
- ._AM_FORM_ACTION_EDITELEMENT.'alt='._AM_FORM_ACTION_EDITELEMENT.'></a>
- <a href="'.xforms_ADMIN_URL.'?op=edit&clone=1&form_id='.$id.'"><img src='.$pathIcon16.'/editcopy.png title='
- ._AM_FORM_ACTION_CLONE.'alt='._AM_FORM_ACTION_CLONE.'></a>
- <a href="'.xforms_ADMIN_URL.'?op=delete&form_id='.$id.'"><img src='.$pathIcon16.'/delete.png title='
- ._DELETE.'alt='._DELETE.'></a>
- '.$ids->render().'</td>
+ <a href="'.xforms_ADMIN_URL.'?op=edit&form_id='.$id.'"><img src='.$pathIcon16.'/edit.png title='._AM_FORM_ACTION_EDITFORM.'alt='._AM_FORM_ACTION_EDITFORM.'></a>
+ <a href="'.'elements.php?form_id='.$id.'"><img src='.$pathIcon16.'/1day.png title='._AM_FORM_ACTION_EDITELEMENT.'alt='._AM_FORM_ACTION_EDITELEMENT.'></a>
+ <a href="'.xforms_ADMIN_URL.'?op=edit&clone=1&form_id='.$id.'"><img src='.$pathIcon16.'/editcopy.png title='._AM_FORM_ACTION_CLONE.'alt='._AM_FORM_ACTION_CLONE.'></a>
+
+ <a href="'.xforms_ADMIN_URL.'?op=delete&form_id='.$id.'"><img src='.$pathIcon16.'/delete.png title='._DELETE.' alt='._DELETE.'></a>'.$ids->render()
+ .'</td>
</tr>';
}
$submit = new XoopsFormButton('', 'submit', _AM_RESET_ORDER, 'submit');
Modified: XoopsModules/xforms/branches/mamba/xforms/class/elements.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/class/elements.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/class/elements.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -19,12 +19,12 @@
}
}
-class xformsElementsHandler {
+class xformsElementsHandler extends XoopsPersistableObjectHandler{
var $db;
var $db_table;
var $obj_class = 'xformsElements';
- function xformsElementsHandler($db) {
+ function __construct($db) {
$this->db = $db;
$this->db_table = $this->db->prefix('xforms_formelements');
}
Modified: XoopsModules/xforms/branches/mamba/xforms/class/forms.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/class/forms.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/class/forms.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -22,13 +22,13 @@
}
}
-class xformsFormsHandler extends XoopsObjectHandler {
+class xformsFormsHandler extends XoopsPersistableObjectHandler {
var $db;
var $db_table;
var $perm_name = 'xforms_form_access';
var $obj_class = 'xformsForms';
- function xformsFormsHandler(&$db){
+ function __construct(&$db){
$this->db = $db;
$this->db_table = $this->db->prefix('xforms_forms');
}
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-25 16:26:38 UTC (rev 9716)
@@ -1,6 +1,7 @@
1.21 Mamba (2011-07-18)
=================================
-- updated to the XOOPS 2.5.x GUI (using ModuleAdmin class)
+- fixing some bugs: (black_beard)
+- updated to the XOOPS 2.5.x Admin GUI (mamba)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -107,8 +107,7 @@
define("_AM_IMPORT_NFND", "Liaise is not found on your system!");
//ModuleAdmin
-define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
-define("_AM_MARQUEE_BGCOLOR_SHORT","Background color");
+define('_AM_XFORMS_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
// Text for Admin footer
-define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-06-25 14:15:41 UTC (rev 9715)
+++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-06-25 16:26:38 UTC (rev 9716)
@@ -19,10 +19,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/12/12';
+$modversion['release_date'] = '2012/06/25';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
+$modversion["module_status"] = "Final";
$modversion['min_php']='5.2';
$modversion['min_xoops']="2.5";
$modversion['min_admin']='1.1';
@@ -58,109 +58,109 @@
$modversion['templates'][3]['description'] = _MI_xforms_TMPL_ERROR_DESC;
// Module Configs
+// Module config setting
+$i=1;
// $xoopsModuleConfig['t_width']
-$modversion['config'][1]['name'] = 't_width';
-$modversion['config'][1]['title'] = '_MI_xforms_TEXT_WIDTH';
-$modversion['config'][1]['description'] = '';
-$modversion['config'][1]['formtype'] = 'textbox';
-$modversion['config'][1]['valuetype'] = 'int';
-$modversion['config'][1]['default'] = '35';
-
+$modversion['config'][$i]['name'] = 't_width';
+$modversion['config'][$i]['title'] = '_MI_xforms_TEXT_WIDTH';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = '35';
+$i++;
// $xoopsModuleConfig['t_max']
-$modversion['config'][2]['name'] = 't_max';
-$modversion['config'][2]['title'] = '_MI_xforms_TEXT_MAX';
-$modversion['config'][2]['description'] = '';
-$modversion['config'][2]['formtype'] = 'textbox';
-$modversion['config'][2]['valuetype'] = 'int';
-$modversion['config'][2]['default'] = '255';
-
+$modversion['config'][$i]['name'] = 't_max';
+$modversion['config'][$i]['title'] = '_MI_xforms_TEXT_MAX';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = '255';
+$i++;
// $xoopsModuleConfig['ta_rows']
-$modversion['config'][3]['name'] = 'ta_rows';
-$modversion['config'][3]['title'] = '_MI_xforms_TAREA_ROWS';
-$modversion['config'][3]['description'] = '';
-$modversion['config'][3]['formtype'] = 'textbox';
-$modversion['config'][3]['valuetype'] = 'int';
-$modversion['config'][3]['default'] = '5';
-
+$modversion['config'][$i]['name'] = 'ta_rows';
+$modversion['config'][$i]['title'] = '_MI_xforms_TAREA_ROWS';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = '5';
+$i++;
// $xoopsModuleConfig['ta_cols']
-$modversion['config'][4]['name'] = 'ta_cols';
-$modversion['config'][4]['title'] = '_MI_xforms_TAREA_COLS';
-$modversion['config'][4]['description'] = '';
-$modversion['config'][4]['formtype'] = 'textbox';
-$modversion['config'][4]['valuetype'] = 'int';
-$modversion['config'][4]['default'] = '35';
-
+$modversion['config'][$i]['name'] = 'ta_cols';
+$modversion['config'][$i]['title'] = '_MI_xforms_TAREA_COLS';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = '35';
+$i++;
// $xoopsModuleConfig['moreinfo']
-$modversion['config'][5]['name'] = 'moreinfo';
-$modversion['config'][5]['title'] = '_MI_xforms_MOREINFO';
-$modversion['config'][5]['description'] = '';
-$modversion['config'][5]['formtype'] = 'select_multi';
-$modversion['config'][5]['valuetype'] = 'array';
-$modversion['config'][5]['default'] = array('user', 'ip', 'agent');
-$modversion['config'][5]['options'] = array(_MI_xforms_MOREINFO_USER => 'user', _MI_xforms_MOREINFO_IP => 'ip', _MI_xforms_MOREINFO_AGENT => 'agent', _MI_xforms_MOREINFO_FORM => 'form');
-
+$modversion['config'][$i]['name'] = 'moreinfo';
+$modversion['config'][$i]['title'] = '_MI_xforms_MOREINFO';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'select_multi';
+$modversion['config'][$i]['valuetype'] = 'array';
+$modversion['config'][$i]['default'] = array('user', 'ip', 'agent');
+$modversion['config'][$i]['options'] = array(_MI_xforms_MOREINFO_USER => 'user', _MI_xforms_MOREINFO_IP => 'ip', _MI_xforms_MOREINFO_AGENT => 'agent', _MI_xforms_MOREINFO_FORM => 'form');
+$i++;
// $xoopsModuleConfig['mail_charset']
-$modversion['config'][6]['name'] = 'mail_charset';
-$modversion['config'][6]['title'] = '_MI_xforms_MAIL_CHARSET';
-$modversion['config'][6]['description'] = '_MI_xforms_MAIL_CHARSET_DESC';
-$modversion['config'][6]['formtype'] = 'textbox';
-$modversion['config'][6]['valuetype'] = 'text';
-$modversion['config'][6]['default'] = _CHARSET;
-
+$modversion['config'][$i]['name'] = 'mail_charset';
+$modversion['config'][$i]['title'] = '_MI_xforms_MAIL_CHARSET';
+$modversion['config'][$i]['description'] = '_MI_xforms_MAIL_CHARSET_DESC';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _CHARSET;
+$i++;
// $xoopsModuleConfig['prefix']
-$modversion['config'][7]['name'] = 'prefix';
-$modversion['config'][7]['title'] = '_MI_xforms_PREFIX';
-$modversion['config'][7]['description'] = '';
-$modversion['config'][7]['formtype'] = 'textbox';
-$modversion['config'][7]['valuetype'] = 'text';
-$modversion['config'][7]['default'] = '';
-
+$modversion['config'][$i]['name'] = 'prefix';
+$modversion['config'][$i]['title'] = '_MI_xforms_PREFIX';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
// $xoopsModuleConfig['suffix']
-$modversion['config'][8]['name'] = 'suffix';
-$modversion['config'][8]['title'] = '_MI_xforms_SUFFIX';
-$modversion['config'][8]['description'] = '';
-$modversion['config'][8]['formtype'] = 'textbox';
-$modversion['config'][8]['valuetype'] = 'text';
-$modversion['config'][8]['default'] = '*';
-
+$modversion['config'][$i]['name'] = 'suffix';
+$modversion['config'][$i]['title'] = '_MI_xforms_SUFFIX';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '*';
+$i++;
// $xoopsModuleConfig['intro']
-$modversion['config'][9]['name'] = 'intro';
-$modversion['config'][9]['title'] = '_MI_xforms_INTRO';
-$modversion['config'][9]['description'] = '';
-$modversion['config'][9]['formtype'] = 'textarea';
-$modversion['config'][9]['valuetype'] = 'text';
-$modversion['config'][9]['default'] = _MI_xforms_INTRO_DEFAULT;
-
+$modversion['config'][$i]['name'] = 'intro';
+$modversion['config'][$i]['title'] = '_MI_xforms_INTRO';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textarea';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_xforms_INTRO_DEFAULT;
+$i++;
// $xoopsModuleConfig['intro']
-$modversion['config'][9]['name'] = 'noform';
-$modversion['config'][9]['title'] = '_MI_xforms_NOFORM';
-$modversion['config'][9]['description'] = '';
-$modversion['config'][9]['formtype'] = 'textarea';
-$modversion['config'][9]['valuetype'] = 'text';
-$modversion['config'][9]['default'] = _MI_xforms_NOFORM_DEFAULT;
-
+$modversion['config'][$i]['name'] = 'noform';
+$modversion['config'][$i]['title'] = '_MI_xforms_NOFORM';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textarea';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_xforms_NOFORM_DEFAULT;
+$i++;
// $xoopsModuleConfig['global']
-$modversion['config'][10]['name'] = 'global';
-$modversion['config'][10]['title'] = '_MI_xforms_GLOBAL';
-$modversion['config'][10]['description'] = '';
-$modversion['config'][10]['formtype'] = 'textarea';
-$modversion['config'][10]['valuetype'] = 'text';
-$modversion['config'][10]['default'] = _MI_xforms_GLOBAL_DEFAULT;
-
+$modversion['config'][$i]['name'] = 'global';
+$modversion['config'][$i]['title'] = '_MI_xforms_GLOBAL';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'textarea';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_xforms_GLOBAL_DEFAULT;
+$i++;
// $xoopsModuleConfig['uploaddir']
-$modversion['config'][11]['name'] = 'uploaddir';
-$modversion['config'][11]['title'] = '_MI_xforms_UPLOADDIR';
-$modversion['config'][11]['description'] = '_MI_xforms_UPLOADDIR_DESC';
-$modversion['config'][11]['formtype'] = 'textbox';
-$modversion['config'][11]['valuetype'] = 'text';
-$modversion['config'][11]['default'] = XOOPS_UPLOAD_PATH.'/'.uniqid(rand());
-
+$modversion['config'][$i]['name'] = 'uploaddir';
+$modversion['config'][$i]['title'] = '_MI_xforms_UPLOADDIR';
+$modversion['config'][$i]['description'] = '_MI_xforms_UPLOADDIR_DESC';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = XOOPS_UPLOAD_PATH.'/'.uniqid(rand());
+$i++;
// $xoopsModuleConfig['captcha']
-$modversion['config'][12]['name'] = 'captcha';
-$modversion['config'][12]['title'] = '_MI_xforms_CAPTCHA';
-$modversion['config'][12]['description'] = '_MI_xforms_CAPTCHADSC';
-$modversion['config'][12]['formtype'] = 'yesno';
-$modversion['config'][12]['valuetype'] = 'int';
-$modversion['config'][12]['default'] = 1;
-
-?>
\ No newline at end of file
+$modversion['config'][$i]['name'] = 'captcha';
+$modversion['config'][$i]['title'] = '_MI_xforms_CAPTCHA';
+$modversion['config'][$i]['description'] = '_MI_xforms_CAPTCHADSC';
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-06-25 14:15:51
|
Revision: 9715
http://xoops.svn.sourceforge.net/xoops/?rev=9715&view=rev
Author: djculex
Date: 2012-06-25 14:15:41 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Change: Changelog upped to RC 9 with recent changes
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-06-25 14:11:24 UTC (rev 9714)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-06-25 14:15:41 UTC (rev 9715)
@@ -1,4 +1,17 @@
------------------------------
+Changelog v.1.15 RC 9
+------------------------------
+25 June 2012 Revision 9645 - 9713
+
+- Change: Typos corrected (Defkon1)
+- Change: Country flags is replaced in images/ to be used by geonames.js plugins
+- Bugfix: Accidently xoops error logger is true. Now set to false to return valid jSon
+- Bugfix: Smallworld jquery.js and jquery.ui.js is extended after load then overwritten by xoops javascript. Special check for xoops version is included in core.php
+- Bugfix: Json array using illegal whitespace in ajax
+- Bugfix: Geonames.js plugin using country maps in dropdown
+- Bugfix: Replace country code by image using geonames plugin Vs country text using google maps
+
+------------------------------
Changelog v.1.15 RC 8
------------------------------
12 June 2012 Revision 9540 - 9642
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-06-25 14:11:34
|
Revision: 9714
http://xoops.svn.sourceforge.net/xoops/?rev=9714&view=rev
Author: djculex
Date: 2012-06-25 14:11:24 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Bugfix: Inserting default zeroes if values returned are empty. Avoiding illegal Json returns
Modified Paths:
--------------
XoopsModules/xim/trunk/modules/xim/getmystats.php
Modified: XoopsModules/xim/trunk/modules/xim/getmystats.php
===================================================================
--- XoopsModules/xim/trunk/modules/xim/getmystats.php 2012-06-25 14:08:52 UTC (rev 9713)
+++ XoopsModules/xim/trunk/modules/xim/getmystats.php 2012-06-25 14:11:24 UTC (rev 9714)
@@ -46,6 +46,14 @@
$status = $myrow['status'];
$sound = $myrow['sound'];
}
+
+ if ($sound == '') {
+ $sound = 0;
+ }
+
+ if ($status == '') {
+ $status = 0;
+ }
header('Content-type: application/json');
echo "{\"myid\":$uid, \"uso\":$sound, \"uss\":$status}";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-06-25 14:09:02
|
Revision: 9713
http://xoops.svn.sourceforge.net/xoops/?rev=9713&view=rev
Author: djculex
Date: 2012-06-25 14:08:52 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Change: Country flags is replaced in images/ to be used by geonames.js plugins
Added Paths:
-----------
XoopsModules/smallworld/trunk/smallworld/images/flags/
XoopsModules/smallworld/trunk/smallworld/images/flags/ad.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ae.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/af.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ag.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ai.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/al.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/am.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/an.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ao.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ar.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/as.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/at.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/au.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/aw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ax.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/az.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ba.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bb.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bd.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/be.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bf.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bh.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bi.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bj.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bo.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/br.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bs.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bt.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bv.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/by.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/bz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ca.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/catalonia.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cc.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cd.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cf.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ch.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ci.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ck.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cl.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/co.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cs.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cu.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cv.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cx.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cy.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/cz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/de.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/dj.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/dk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/dm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/do.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/dz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ec.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ee.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/eg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/eh.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/england.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/er.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/es.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/et.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/europeanunion.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/fam.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/fi.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/fj.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/fk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/fm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/fo.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/fr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ga.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gb.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gd.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ge.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gf.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gh.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gi.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gl.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gp.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gq.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gs.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gt.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gu.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/gy.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/hk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/hm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/hn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/hr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ht.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/hu.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/id.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ie.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/il.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/in.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/index.html
XoopsModules/smallworld/trunk/smallworld/images/flags/io.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/iq.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ir.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/is.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/it.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/jm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/jo.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/jp.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ke.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/kg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/kh.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ki.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/km.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/kn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/kp.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/kr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/kw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ky.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/kz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/la.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/lb.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/lc.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/li.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/lk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/lr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ls.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/lt.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/lu.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/lv.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ly.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ma.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mc.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/md.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/me.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mh.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ml.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mo.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mp.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mq.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ms.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mt.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mu.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mv.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mx.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/my.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/mz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/na.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/nc.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ne.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/nf.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ng.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ni.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/nl.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/no.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/np.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/nr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/nu.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/nz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/om.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pa.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pe.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pf.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ph.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pl.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ps.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pt.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/pw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/py.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/qa.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/re.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ro.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/rs.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ru.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/rw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sa.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sb.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sc.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/scotland.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sd.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/se.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sh.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/si.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sj.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sl.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/so.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/st.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sv.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sy.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/sz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tc.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/td.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tf.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/th.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tj.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tk.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tl.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/to.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tr.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tt.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tv.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tw.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/tz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ua.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ug.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/um.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/us.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/uy.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/uz.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/va.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/vc.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ve.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/vg.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/vi.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/vn.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/vu.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/wales.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/wf.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ws.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/ye.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/yt.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/za.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/zm.gif
XoopsModules/smallworld/trunk/smallworld/images/flags/zw.gif
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ad.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ad.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ae.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ae.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/af.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/af.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ag.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ag.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ai.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ai.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/al.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/al.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/am.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/am.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/an.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/an.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ao.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ao.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ar.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ar.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/as.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/as.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/at.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/at.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/au.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/au.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/aw.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/aw.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ax.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ax.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/az.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/az.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ba.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ba.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bb.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bb.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bd.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bd.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/be.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/be.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bf.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bf.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bg.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bh.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bh.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bi.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bi.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bj.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bj.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bm.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bm.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bn.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bn.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bo.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bo.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/br.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/br.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bs.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bs.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bt.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bt.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bv.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bv.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bw.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bw.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/by.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/by.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/bz.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/bz.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ca.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ca.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/catalonia.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/catalonia.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cc.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cc.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cd.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cd.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cf.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cf.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cg.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ch.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ch.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ci.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ci.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ck.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ck.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cl.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cl.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cm.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cm.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cn.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cn.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/co.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/co.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cr.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cr.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cs.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cs.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cu.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cu.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cv.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cv.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cx.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cx.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cy.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cy.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/cz.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/cz.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/de.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/de.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/dj.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/dj.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/dk.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/dk.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/dm.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/dm.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/do.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/do.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/dz.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/dz.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ec.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ec.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ee.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ee.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/eg.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/eg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/eh.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/eh.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/england.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/england.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/er.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/er.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/es.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/es.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/et.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/et.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/europeanunion.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/europeanunion.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/fam.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/fam.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/fi.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/fi.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/fj.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/fj.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/fk.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/fk.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/fm.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/fm.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/fo.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/fo.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/fr.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/fr.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ga.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ga.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gb.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gb.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gd.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gd.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ge.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ge.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gf.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gf.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gh.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gh.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gi.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gi.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gl.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gl.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gm.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gm.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gn.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gn.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gp.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gp.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gq.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gq.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gr.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gr.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gs.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gs.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gt.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gt.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gu.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gu.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gw.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gw.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/gy.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/gy.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/hk.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/hk.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/hm.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/hm.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/hn.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/hn.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/hr.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/hr.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ht.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ht.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/hu.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/hu.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/id.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/id.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ie.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ie.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/il.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/il.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/in.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/in.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/index.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/images/flags/index.html (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/images/flags/index.html 2012-06-25 14:08:52 UTC (rev 9713)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/io.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/io.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/iq.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/iq.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ir.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ir.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/is.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/is.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/it.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/it.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/jm.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/jm.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/jo.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/jo.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/jp.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/jp.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ke.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ke.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/kg.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/kg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/kh.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/kh.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/ki.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/ki.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/km.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/km.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/kn.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/kn.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/kp.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/kp.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/smallworld/trunk/smallworld/images/flags/kr.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/smallworld/trunk/smallworld/images/flags/kr.gif
_______________________________________________________________...
[truncated message content] |
|
From: <dj...@us...> - 2012-06-25 14:00:53
|
Revision: 9712
http://xoops.svn.sourceforge.net/xoops/?rev=9712&view=rev
Author: djculex
Date: 2012-06-25 14:00:46 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Bugfix: Accidently xoops error logger is true. Now set to false to return valid jSon
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/Get_Count.php
Modified: XoopsModules/smallworld/trunk/smallworld/Get_Count.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/Get_Count.php 2012-06-25 13:59:53 UTC (rev 9711)
+++ XoopsModules/smallworld/trunk/smallworld/Get_Count.php 2012-06-25 14:00:46 UTC (rev 9712)
@@ -24,14 +24,14 @@
include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
global $xoopsUser, $xoopsLogger, $xoopsDB, $xoopsTpl;
-$xoopsLogger->activated = true;
+$xoopsLogger->activated = false;
$xoopsTpl->caching = 0;
$_COOKIE[session_name()] = session_id();
if ($xoopsUser) {
if($_GET['SmallworldGetUserMsgCount']) {
$counts = smallworld_getCountFriendMessagesEtc();
header('Content-type: application/json');
- echo "{\"NewUserMsgCount\":\"$counts\"}";
+ echo "{\"NewUserMsgCount\":$counts}";
}
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-06-25 14:00:04
|
Revision: 9711
http://xoops.svn.sourceforge.net/xoops/?rev=9711&view=rev
Author: djculex
Date: 2012-06-25 13:59:53 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Bugfix: Smallworld jquery.js and jquery.ui.js is extended after load then overwritten by xoops javascript. Special check for xoops version is included in core.php
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/preloads/core.php
Modified: XoopsModules/smallworld/trunk/smallworld/preloads/core.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2012-06-25 13:57:20 UTC (rev 9710)
+++ XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2012-06-25 13:59:53 UTC (rev 9711)
@@ -43,8 +43,17 @@
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/base/jquery.ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
+
+ //Check xoops version. If bigger than 2.5.0 then include by internal jquery plugins
+
+ $ver = explode(" ", XOOPS_VERSION);
+ if ($ver[1] >= '2.4.0') {
+ $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ } else {
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
+ }
$myid = $xoopsUser->getVar('uid');
// GET various variables from language folder
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-06-25 13:57:26
|
Revision: 9710
http://xoops.svn.sourceforge.net/xoops/?rev=9710&view=rev
Author: djculex
Date: 2012-06-25 13:57:20 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Bugfix: Json array using illegal whitespace in ajax
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-06-25 13:56:15 UTC (rev 9709)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-06-25 13:57:20 UTC (rev 9710)
@@ -252,19 +252,21 @@
// Make Textareas elastic
- if (xoops_smallworld(".favourites").length > 0 ||
- xoops_smallworld(".smallworld_comment").length > 0 ||
- xoops_smallworld("#smallworld_update").length > 0 ||
- xoops_smallworld("#smallworld_update_profile").length > 0
- )
- {
- xoops_smallworld(function() {
- xoops_smallworld('.favourites, .smallworld_comment, #smallworld_update, #smallworld_update_profile').elastic();
- xoops_smallworld('.smallworld_comment').css('max-width', xoops_smallworld('.smallworld_stcommentbody').outerWidth() - 90 + 'px');
- xoops_smallworld('#smallworld_update').css('max-width', xoops_smallworld('#smallworld_wall_container').outerWidth() - 30 + 'px');
+ xoops_smallworld(function() {
+ if (xoops_smallworld(".favourites").length > 0 ||
+ xoops_smallworld(".smallworld_comment").length > 0 ||
+ xoops_smallworld("#smallworld_update").length > 0 ||
+ xoops_smallworld("#smallworld_update_profile").length > 0
+ )
+ {
+ xoops_smallworld(function() {
+ xoops_smallworld('.favourites, .smallworld_comment, #smallworld_update, #smallworld_update_profile').elastic();
+ xoops_smallworld('.smallworld_comment').css('max-width', xoops_smallworld('.smallworld_stcommentbody').outerWidth() - 90 + 'px');
+ xoops_smallworld('#smallworld_update').css('max-width', xoops_smallworld('#smallworld_wall_container').outerWidth() - 30 + 'px');
- });
- }
+ });
+ }
+ });
// Toggle the form 'partner' if choosen status is married, in relationship, complicated
xoops_smallworld(function() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-06-25 13:56:24
|
Revision: 9709
http://xoops.svn.sourceforge.net/xoops/?rev=9709&view=rev
Author: djculex
Date: 2012-06-25 13:56:15 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Bugfix: Geonames.js plugin using country maps in dropdown
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/geoname.js
XoopsModules/smallworld/trunk/smallworld/js/geoname_now.js
Modified: XoopsModules/smallworld/trunk/smallworld/js/geoname.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/geoname.js 2012-06-25 13:55:01 UTC (rev 9708)
+++ XoopsModules/smallworld/trunk/smallworld/js/geoname.js 2012-06-25 13:56:15 UTC (rev 9709)
@@ -14,7 +14,8 @@
},
success: function( data ) {
response( xoops_smallworld.map( data.geonames, function( item ) {
- img = "<img src='"+smallworld_url+"images/flags/" + item.countryCode+ ".gif'>";
+ countryname = item.countryCode.toLowerCase();
+ img = "<img src='"+smallworld_url+"images/flags/" + countryname + ".gif'>";
var lng = item.lng;
var lat = item.lat;
return {
Modified: XoopsModules/smallworld/trunk/smallworld/js/geoname_now.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/geoname_now.js 2012-06-25 13:55:01 UTC (rev 9708)
+++ XoopsModules/smallworld/trunk/smallworld/js/geoname_now.js 2012-06-25 13:56:15 UTC (rev 9709)
@@ -33,7 +33,7 @@
xoops_smallworld("input[name=present_lng]").val( ui.item.source.lng );
var flag = ui.item.source.countryCode.toLowerCase();
xoops_smallworld("#flag").html("<img src='"+smallworld_url+"images/flags/"+flag+".gif'");
- xoops_smallworld("input[name=present_country]").val(smallworld_url+"images/flags/"+flag+".gif");
+ xoops_smallworld("input[name=present_country]").val(ui.item.source.countryName);
xoops_smallworld("input[name=present_country_img]").val(smallworld_url+"images/flags/"+flag+".gif");
xoops_smallworld(this).val(ui.item.value);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-06-25 13:55:07
|
Revision: 9708
http://xoops.svn.sourceforge.net/xoops/?rev=9708&view=rev
Author: djculex
Date: 2012-06-25 13:55:01 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Bugfix: Replace country code by image using geonames plugin Vs country text using google maps
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/class/profile.php
Modified: XoopsModules/smallworld/trunk/smallworld/class/profile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-06-24 21:17:44 UTC (rev 9707)
+++ XoopsModules/smallworld/trunk/smallworld/class/profile.php 2012-06-25 13:55:01 UTC (rev 9708)
@@ -30,6 +30,12 @@
function ShowUser ($id) {
global $xoopsUser, $xoTheme, $xoopsTpl, $arr04, $arr05, $xoopsDB;
if ($xoopsUser) {
+
+ $module_handler =& xoops_gethandler('module');
+ $module = $module_handler->getByDirname('smallworld');
+ $config_handler =& xoops_gethandler('config');
+ $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+
$user = new XoopsUser($id);
$myName = $xoopsUser->getUnameFromId($xoopsUser->getVar('uid')); // My name
$db = new SmallWorldDB;
@@ -62,7 +68,11 @@
$education = "<a href='javascript:void(0)' id='_smallworld_educationmore'>".$educationArray[0]." ("._SMALLWORLD_MORE.")</a>";
$lng = $r['birthplace_lng'];
$latt = $r['birthplace_lat'];
- $country = $r['birthplace_country'];
+ if($moduleConfig['geolocate'] != 1) {
+ $country = "<img src='".$r['birthplace_country']."'/>";
+ } else {
+ $country = $r['birthplace_country'];
+ }
$rank = $user->rank();
$rank_title = $rank['title'];
if (isset($rank['image'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-24 21:17:51
|
Revision: 9707
http://xoops.svn.sourceforge.net/xoops/?rev=9707&view=rev
Author: mageg
Date: 2012-06-24 21:17:44 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
modified ligne_break
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/form.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php 2012-06-24 20:24:10 UTC (rev 9706)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php 2012-06-24 21:17:44 UTC (rev 9707)
@@ -37,7 +37,7 @@
*/
public function insertBreak($extra = '', $class = '')
{
- $class = ($class != '' ? " class='" . $class . "'" : '');
+ $class = ($class != '' ? " class='" . $class . "'" : " class='break'");
// Fix for $extra tag not showing
if ($extra) {
$value = '<div' . $class . '>' . $extra . '</div>';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/form.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/form.css 2012-06-24 20:24:10 UTC (rev 9706)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/form.css 2012-06-24 21:17:44 UTC (rev 9707)
@@ -20,3 +20,8 @@
}
.caption-required{color: #b94a48;}
+
+.break{
+ font-size: 1.2em;
+ font-weight: bold;
+}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-06-24 20:24:10 UTC (rev 9706)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-06-24 21:17:44 UTC (rev 9707)
@@ -197,7 +197,7 @@
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'line_break';
$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'textcenter';
+$modversion['config'][$i]['default'] = 'break';
$i++;
$modversion['config'][$i]['name'] = 'usetips';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_TIPS';
@@ -241,7 +241,7 @@
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'line_break';
$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'txtcenter';
+$modversion['config'][$i]['default'] = 'break';
$i++;
$modversion['config'][$i]['name'] = 'active_blocksadmin';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN';
@@ -325,7 +325,7 @@
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'line_break';
$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'txtcenter';
+$modversion['config'][$i]['default'] = 'break';
$i++;
$modversion['config'][$i]['name'] = 'comments_pager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_PAGER';
@@ -360,7 +360,7 @@
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'line_break';
$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'txtcenter';
+$modversion['config'][$i]['default'] = 'break';
$i++;
$editors = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor');
$modversion['config'][$i]['name'] = 'blocks_editor';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-24 20:24:17
|
Revision: 9706
http://xoops.svn.sourceforge.net/xoops/?rev=9706&view=rev
Author: beckmi
Date: 2012-06-24 20:24:10 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Moving Docs link to Help (Shine)
Modified Paths:
--------------
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html
XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html
Added Paths:
-----------
XoopsModules/wflink/trunk/htdocs/Frameworks/moduleclasses/icons/32/brokenlink.png
Added: XoopsModules/wflink/trunk/htdocs/Frameworks/moduleclasses/icons/32/brokenlink.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/wflink/trunk/htdocs/Frameworks/moduleclasses/icons/32/brokenlink.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php 2012-06-24 20:24:10 UTC (rev 9706)
@@ -388,6 +388,11 @@
default:
xoops_cp_header();
//wfl_adminmenu(_AM_WFL_MCATEGORY);
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('category.php');
+ $indexAdmin->addItemButton(_MI_WFL_ADD_LINK, 'main.php?op=edit', 'add', '');
+ $indexAdmin->addItemButton(_MI_WFL_ADD_CATEGORY, 'category.php', 'add', '');
+ echo $indexAdmin->renderButton('right', '');
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$mytree = new XoopsTree($xoopsDB -> prefix('wflinks_cat'), "cid", "pid");
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php 2012-06-24 20:24:10 UTC (rev 9706)
@@ -48,7 +48,6 @@
list( $indeximage, $indexheading, $indexheader, $indexfooter, $nohtml, $nosmiley, $noxcodes, $noimages, $nobreak, $indexheaderalign, $indexfooteralign, $lastlinksyn, $lastlinkstotal ) = $xoopsDB -> fetchrow( $result );
xoops_cp_header();
- //wfl_adminmenu( _AM_WFL_INDEXPAGE );
echo "
<fieldset><legend style='font-weight: bold; color: #0A3760;'>" . _AM_WFL_IPAGE_INFORMATION . "</legend>\n
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-24 20:24:10 UTC (rev 9706)
@@ -60,6 +60,7 @@
$email = $link_array['email'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['email'] ) : '';
$vat = $link_array['vat'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['vat'] ) : '';
+ include 'admin_header.php';
xoops_cp_header();
//wfl_adminmenu( _AM_WFL_MLINKS );
@@ -380,6 +381,7 @@
$heading = ( $op == "pingtime" ) ? _AM_WFL_PINGTIMES : _AM_WFL_LISTBROKEN;
+ include 'admin_header.php';
xoops_cp_header();
// wfl_adminmenu( _AM_WFL_BINDEX, '', $heading );
echo "
@@ -606,6 +608,7 @@
}
list( $lid, $title ) = $xoopsDB -> fetchrow( $result );
$item_tag = $result['item_tag'];
+ include 'admin_header.php';
xoops_cp_header();
//wfl_adminmenu( _AM_WFL_BINDEX );
xoops_confirm( array( 'op' => 'delete', 'lid' => $lid, 'confirm' => 1, 'title' => $title ), 'main.php', _AM_WFL_LINK_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE );
@@ -666,23 +669,23 @@
// </small></div></fieldset><br />\n
// ";
- if ( $totalcats > 0 ) {
- $sform = new XoopsThemeForm( _AM_WFL_CCATEGORY_MODIFY, "category", "category.php" );
- ob_start();
- $mytree -> makeMySelBox( "title", "title" );
- $sform -> addElement( new XoopsFormLabel( _AM_WFL_CCATEGORY_MODIFY_TITLE, ob_get_contents() ) );
- ob_end_clean();
- $dup_tray = new XoopsFormElementTray( '', '' );
- $dup_tray -> addElement( new XoopsFormHidden( 'op', 'modCat' ) );
- $butt_dup = new XoopsFormButton( '', '', _AM_WFL_BMODIFY, 'submit' );
- $butt_dup -> setExtra( 'onclick="this.form.elements.op.value=\'modCat\'"' );
- $dup_tray -> addElement( $butt_dup );
- $butt_dupct = new XoopsFormButton( '', '', _AM_WFL_BDELETE, 'submit' );
- $butt_dupct -> setExtra( 'onclick="this.form.elements.op.value=\'del\'"' );
- $dup_tray -> addElement( $butt_dupct );
- $sform -> addElement( $dup_tray );
- $sform -> display();
- }
+// if ( $totalcats > 0 ) {
+// $sform = new XoopsThemeForm( _AM_WFL_CCATEGORY_MODIFY, "category", "category.php" );
+// ob_start();
+// $mytree -> makeMySelBox( "title", "title" );
+// $sform -> addElement( new XoopsFormLabel( _AM_WFL_CCATEGORY_MODIFY_TITLE, ob_get_contents() ) );
+// ob_end_clean();
+// $dup_tray = new XoopsFormElementTray( '', '' );
+// $dup_tray -> addElement( new XoopsFormHidden( 'op', 'modCat' ) );
+// $butt_dup = new XoopsFormButton( '', '', _AM_WFL_BMODIFY, 'submit' );
+// $butt_dup -> setExtra( 'onclick="this.form.elements.op.value=\'modCat\'"' );
+// $dup_tray -> addElement( $butt_dup );
+// $butt_dupct = new XoopsFormButton( '', '', _AM_WFL_BDELETE, 'submit' );
+// $butt_dupct -> setExtra( 'onclick="this.form.elements.op.value=\'del\'"' );
+// $dup_tray -> addElement( $butt_dupct );
+// $sform -> addElement( $dup_tray );
+// $sform -> display();
+// }
if ( $totallinks > 0 ) {
$sql = "SELECT * FROM " . $xoopsDB -> prefix( 'wflinks_links' ) . " WHERE published > 0 ORDER BY lid DESC" ;
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php 2012-06-24 20:24:10 UTC (rev 9706)
@@ -39,17 +39,18 @@
$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
$i++;
-$adminmenu[$i]["title"] = _MI_WFL_BINDEX;
+$adminmenu[$i]["title"] = _MI_WFL_MLINKS;
$adminmenu[$i]["link"] = "admin/main.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png';
$i++;
+$adminmenu[$i]['title'] = _MI_WFL_MCATEGORY;
+$adminmenu[$i]['link'] = "admin/category.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
+$i++;
$adminmenu[$i]["title"] = _MI_WFL_INDEXPAGE;
$adminmenu[$i]["link"] = "admin/indexpage.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/index.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_WFL_MCATEGORY;
-$adminmenu[$i]['link'] = "admin/category.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
+
//$i++;
//$adminmenu[$i]['title'] = _MI_WFL_MLINKS;
//$adminmenu[$i]['link']="admin/main.php?op=edit";
@@ -85,10 +86,10 @@
$adminmenu[$i]['link'] = "admin/votedata.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/poll.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_WFL_DOCUMENTATION;
-$adminmenu[$i]['link'] = "docs/english/readme.html";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/help.png';
+//$i++;
+//$adminmenu[$i]['title'] = _MI_WFL_DOCUMENTATION;
+//$adminmenu[$i]['link'] = "docs/english/readme.html";
+//$adminmenu[$i]["icon"] = $pathIcon32 . '/help.png';
$i++;
$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php 2012-06-24 20:24:10 UTC (rev 9706)
@@ -48,8 +48,12 @@
</tr>
</table>";
+
+
+
+
echo "
- <fieldset style='border: #e8e8e8 1px solid;'><legend style='display: inline; font-weight: bold; color: #0A3760;'>" . _AM_WFL_VOTE_DISPLAYVOTES . "</legend>\n
+ <fieldset><legend style='font-weight: bold; color: #0A3760;'>" . _AM_WFL_VOTE_DISPLAYVOTES . "</legend>\n
<div style='padding: 8px;'>$text_info</div>\n
<div style='padding: 8px;'><li>" . $imagearray['deleteimg'] . " " . _AM_WFL_VOTE_DELETEDSC . "</li></div>\n
</fieldset>\n
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-24 20:24:10 UTC (rev 9706)
@@ -1,3 +1,12 @@
+======================================================
+24-06-2012 1.09 Beta
+============================================================
+Shine and Mamba:
+Fixed: Admin section:
+- missing image: Frameworks/moduleclasses/icons/16/folder_add.png
+- Fixed: Startpage counters don't work in other language than english.
+- Fixed: admin/index.php : Line prox 56 and Prox line 78: was calling 2 ().php files which belong to other module (result of conversion).
+- Changed main menu: moved manual into help. Added 'Link management'
=========================================================
2012-04-25 1.08 Beta 1
=========================================================
@@ -11,7 +20,6 @@
- Changed standard directory where flags are hold. Moved them to uploads/flags. (File: xoopsversion.php)
- Changed standard directory where images: category, screenshots are hold. Moved them to: uploads/wflinks/category and uploads/wflinks/screenshots (file: xoopsversion.php)
-
(below 2 bugs popped up:
Found a small typo in WF-Links 1.07 that causes new links not to be displayed correctly on the Index Page.
To fix this open the file ../templates/wflinks_index.html and find this line:
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php 2012-06-24 20:24:10 UTC (rev 9706)
@@ -159,7 +159,9 @@
// wfl_serverstats()
// @return
function wfl_serverstats() {
- echo "<fieldset style='border: #e8e8e8 1px solid;'><legend style='display: inline; font-weight: bold; color: #0A3760;'>" . _AM_WFL_LINK_IMAGEINFO . "</legend>\n
+
+ echo "
+ <fieldset><legend style='font-weight: bold; color: #0A3760;'>" . _AM_WFL_LINK_IMAGEINFO . "</legend>\n
<div style='padding: 8px;'>\n
<div>" . _AM_WFL_LINK_SPHPINI . "</div>\n";
@@ -759,7 +761,7 @@
function wfl_linklistheader( $heading ) {
echo "
- <h4 style='font-weight: bold; color: #0A3760;'>" . $heading . "</h4>\n
+<!-- <h4 style='font-weight: bold; color: #0A3760;'>" . $heading . "</h4>\n -->
<table width='100%' cellspacing='1' class='outer' style='font-size: smaller;' summary>\n
<tr>\n
<th style='text-align: center;'>" . _AM_WFL_MINDEX_ID . "</th>\n
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html 2012-06-24 20:24:10 UTC (rev 9706)
@@ -40,7 +40,7 @@
<h4 class="odd">Tutorial</h4><br/>
- No tutorial as available at the moment<br/>
+ <a href="../wflinks/docs/english/readme.html" target="_blank">Read Manual!</a><br/>
<!-- -----Help Content ---------- -->
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php 2012-06-24 20:24:10 UTC (rev 9706)
@@ -31,7 +31,7 @@
define("_MI_WFL_BINDEX", "Admin");
define("_MI_WFL_INDEXPAGE", "Index Page");
define("_MI_WFL_MCATEGORY", "Categories");
-define("_MI_WFL_MLINKS", "Link Management");
+define("_MI_WFL_MLINKS", "Links Admin");
define("_MI_WFL_MUPLOADS", "Image Upload");
define("_MI_WFL_PERMISSIONS", "Permission Settings");
define("_MI_WFL_BLOCKADMIN", "Block Settings");
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html 2012-06-24 17:32:44 UTC (rev 9705)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/nederlands/help/help.html 2012-06-24 20:24:10 UTC (rev 9706)
@@ -40,7 +40,7 @@
<h4 class="odd">Tutorial</h4><br/>
- No tutorial as available at the moment<br/>
+ <a href="../wflinks/docs/english/readme.html" target="_blank">Read Manual!</a><br/>
<!-- -----Help Content ---------- -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-24 17:32:50
|
Revision: 9705
http://xoops.svn.sourceforge.net/xoops/?rev=9705&view=rev
Author: beckmi
Date: 2012-06-24 17:32:44 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Adding changes from Revision 9626 (Dugris)
Revision Links:
--------------
http://xoops.svn.sourceforge.net/xoops/?rev=9626&view=rev
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2012-06-24 17:15:30 UTC (rev 9704)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2012-06-24 17:32:44 UTC (rev 9705)
@@ -28,9 +28,9 @@
*/
function __construct()
{
- global $xoopsModule;
+ global $xoopsModule, $xoTheme;
$this->_obj =& $xoopsModule;
- echo "<style type=\"text/css\" media=\"screen\">@import \"" . XOOPS_URL . "/Frameworks/moduleclasses/moduleadmin/css/admin.css\";</style>";
+ $xoTheme->addStylesheet("Frameworks/moduleclasses/moduleadmin/css/admin.css");
$this -> loadLanguage();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-24 17:15:39
|
Revision: 9704
http://xoops.svn.sourceforge.net/xoops/?rev=9704&view=rev
Author: beckmi
Date: 2012-06-24 17:15:30 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Updating TinyMCE to 3.5.4
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/en.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/props.htm
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.5/htdocs/Frameworks/moduleclasses/icons/bookmarks/google_plus.png
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/style/readme.txt
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css
XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js
Modified: XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-06-24 17:15:30 UTC (rev 9704)
@@ -1,6 +1,15 @@
XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
===============================
+2012/06/24: Version 2.5.6 Alpha
+===============================
+Bugfixes:
+
+Updated:
+ - TinyMCE to 3.5.4 (mamba)
+
+
+===============================
2012/04/15: Version 2.5.5 Final
===============================
Bugfixes:
Added: XoopsCore/branches/2.5.x/2.5.5/htdocs/Frameworks/moduleclasses/icons/bookmarks/google_plus.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.5.x/2.5.5/htdocs/Frameworks/moduleclasses/icons/bookmarks/google_plus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2012-06-24 17:15:30 UTC (rev 9704)
@@ -1,3 +1,140 @@
+Version 3.5.4 (2012-06-21)
+ Added missing mouse events to HTML5 schema. Some events needs to be manually defined though since the spec is huge.
+ Added image resizing for WebKit browsers by faking the whole resize behavior.
+ Fixed bug in context menu plugin where listener to hide menu wasn't removed correctly.
+ Fixed bug where media plugin wouldn't use placeholder size for the object/video elements.
+ Fixed bug where jQuery plugin would break attr function in jQuery 1.7.2.
+ Fixed bug where jQuery plugin would throw an error if you used the tinymce pseudo selector when TinyMCE wasn't loaded.
+ Fixed so encoding option gets applied when using jQuery val() or attr() to extract the contents.
+ Fixed so any non valid width/height passed to media plugin would get parsed to proper integer or percent values.
+Version 3.5.3 (2012-06-19)
+ Added missing wbr element to HTML5 schema.
+ Added new mceToggleFormat command. Enabled you to toggle a specific format on/off.
+ Fixed bug where undo/redo state didn't update correctly after executing an execCommand call.
+ Fixed bug where the editor would get auto focused on IE running in quirks mode.
+ Fixed bug where pressing enter before an IMG or INPUT element wouldn't properly split the block.
+ Fixed bug where backspace would navigate back when selecting control types on IE.
+ Fixed bug where the editor remove method would unbind events for controls outside the editor instance UI.
+ Fixed bug where the autosave plugin would try to store a draft copy of editors that where removed.
+ Fixed bug where floated elements wouldn't expand the block created when pressing enter on non IE browsers.
+ Fixed bug where the caret would be placed in the wrong location when pressing enter at the beginning of a block.
+ Fixed bug where it wasn't possible to block events using the handle_event_callback option.
+ Fixed bug where keyboard navigation of the ColorSplitButton.js didn't work correctly.
+ Fixed bug where keyboard navigation didn't work correctly on split buttons.
+ Fixed bug where the legacy Event.add function didn't properly handle multiple id:s passed in.
+ Fixed bug where the caret would disappear on IE when selecting all contents and pressing backspace/delete.
+ Fixed bug where the getStart/getEnd methods would sometimes return elements from the wrong document on IE.
+ Fixed so paragraphs gets created if you press enter inside a form element.
+Version 3.5.2 (2012-05-31)
+ Added new formatChanged method to tinymce.Formatter class. Enables easier state change handling of formats.
+ Added new selectorChanged method to tinymce.dom.Selection class. Enables easier state change handling of matching CSS selectors.
+ Changed the default theme to be advanced instead of simple since most users uses the advanced theme.
+ Changed so the theme_advanced_buttons doesn't have a default set if one button row is specified.
+ Changed the theme_advanced_toolbar_align default value to "left".
+ Changed the theme_advanced_toolbar_location default value to "top".
+ Changed the theme_advanced_statusbar_location default value to "bottom".
+ Fixed bug where the simple link dialog would remove class and target attributes from links when updating them if the drop downs wasn't visible.
+ Fixed bug where the link/unlink buttons wouldn't get disabled once a link was created by the autolink plugin logic.
+ Fixed bug where the border attribute was missing in the HTML5 schema.
+ Fixed bug where the legacyoutput plugin would use inline styles for font color.
+ Fixed bug where editing of anchor names wouldn't produce an undo level.
+ Fixed bug where the table plugin would delete the last empty block element in the editor.
+ Fixed bug where pasting table rows when they where selected would make it impossible to editor that table row.
+ Fixed bug with pressing enter in IE while having a select list focused would produce a JS error.
+ Fixed bug where it wasn't possible to merge table cells by selecting them and using merge from context menu.
+ Removed summary from HTML5 table attributes and fixed so this and other deprecated table fields gets hidden in the table dialog.
+Version 3.5.1.1 (2012-05-25)
+ Fixed bug with control creation where plugin specific controls didn't work as expected.
+Version 3.5.1 (2012-05-25)
+ Added new onBeforeAdd event to UndoManager patch contributed by Dan Rumney.
+ Added support for overriding the theme rendering logic by using a custom function.
+ Fixed bug where links wasn't automatically created by the autolink plugin on old IE versions when pressing enter in BR mode.
+ Fixed bug where enter on older IE versions wouldn't produce a new paragraph if the previous sibling paragraph was empty.
+ Fixed bug where toString on a faked DOM range on older IE versions wouldn't return a proper string.
+ Fixed bug where named anchors wouldn't work properly when schema was set to HTML5.
+ Fixed bug where HTML5 datalist options wasn't correctly parsed or indented.
+ Fixed bug where linking would add anchors around block elements when the HTML5 schema was used.
+ Fixed issue where the autolink plugin wouldn't properly handle mailto:us...@do....
+ Optimized initialization and reduced rendering flicker by hiding the target element while initializing.
+Version 3.5.0.1 (2012-05-10)
+ Fixed bug where selection normalization logic would break the selections of parent elements using the element path.
+ Fixed bug where the autolink plugin would include trailing dots in domain names in the link creation.
+ Fixed bug where the autolink plugin would produce an error on older IE versions when pressing enter.
+ Fixed bug where old IE versions would throw an error during initialization when the editor was placed in an size restricted div.
+Version 3.5 (2012-05-03)
+ Fixed menu rendering issue if the document was in rtl mode.
+ Fixed bug where the hide function would throw an error about a missing variable.
+ Fixed bug where autolink wouldn't convert URLs when hitting enter on IE due to the new enter key logic.
+ Fixed bug where formatting using shortcuts like ctrl+b wouldn't work properly the first time.
+ Fixed bug where selection.setContent after a formatter call wouldn't generate formatted contents.
+ Fixed bug where whitespace would be removed before/after invalid_elements when they where removed.
+ Fixed bug where updating styles using the theme image dialog in non inline mode on IE9 would produce errors.
+ Fixed bug where IE 8 would produce an error when using the contextmenu plugin.
+ Fixed bug where delete/backspace could remove contents of noneditable elements.
+ Fixed so background color in style preview gets computed from body element if the current style element is transparent.
+Version 3.5b3 (2012-03-29)
+ Added cancel button to colour picker dialog.
+ Added figure and figcaption to the html5 visualblocks plugin.
+ Added default alignment options for the figure element.
+ Fixed bug where empty inline elements within block elements would sometimes produce a br child element.
+ Fixed bug where urls pointing to the same domain as the current one would cause undefined errors. Patch contributed by Paul Giberson.
+ Fixed bug where enter inside an editable element inside an non editable element would split the element.
+ Fixed bug where cut/copy/paste of noneditable elements didn't work.
+ Fixed bug where backspace would sometimes produce font elements on WebKit.
+ Fixed bug where WebKit would produce spans out of various inline elements when using backspace.
+ Fixed bug where IE9 wouldn't properly update image styles when images where resized.
+ Fixed bug where drag/drop of noneditable elements didn't work correctly.
+ Fixed bug where applying formatting to all contents wouldn't work correctly when an end point was inside an empty bock. Patch contributed by Jose Luiz.
+ Fixed bug where IE10 removed the scopeName from the DOM element interface and there for it produced an undefined string in element path.
+ Fixed bug where the caret would be placed at an incorrect location if you applied block formatting while having the caret at the end of the block.
+ Fixed bug where applying column changes using the cell dialog would only update the first column. Patch contributed by krzyko.
+ Fixed bug where the visualblocks plugin would force editor focus if it was turned on by default.
+ Fixed bug where the tabfocus plugin would tab to iframes these are now ignored.
+ Fixed bug where format drop down list wouldn't show the currently active format for a parent element.
+ Fixed bug where paste of plain text in IE 9 would remove the new line characters from text.
+ Fixed bug where the menu buttons/split button menus wouldn't be opened at the right location on older IE versions.
+ Fixed bug where Gecko browsers wouldn't properly display the right format when having the selection as specific places.
+ Fixed bug where shift+enter inside the body when having forced_root_blocks set to false would throw an error.
+ Fixed bug where the jQuery plugin would break the attr method of jQuery 1.7.2. Patch contributed by Markus Kemmerling.
+ Fixed so options like content_css accepts and array as well as a comma separated string as input.
+ Restructured the internal logic to make it more separate from Editor.js.
+ Updated the Sizzle engine to the latest version.
+Version 3.5b2 (2012-03-15)
+ Rewrote the enter key logic to normalize browser behavior.
+ Fixed so enter within PRE elements produces a BR and shift+enter breaks/end the PRE. Can be disabled using the br_in_pre option.
+ Fixed bug where the selection wouldn't be correct after applying formatting and having the caret at the end of the new format node.
+ Fixed bug where the noneditable plugin would process contents on raw input calls for example on undo/redo calls.
+ Fixed bug where WebKit could produce an exception when a bookmark was requested when there wasn't a proper selection.
+ Fixed bug where WebKit would fail to open the image dialog since it would be returning false for a class name instead of a string.
+ Fixed so alignment and indentation works properly when forced_root_blocks is set to false. It will produce a DIV by default.
+Version 3.5b1 (2012-03-08)
+ Added new event class that is faster and enables support for faking events.
+ Added new self_closing_elements, short_ended_elements, boolean_attributes, non_empty_elements and block_elements options to control the HTML Schema.
+ Added new schema option and support for the HTML5 schema.
+ Added new visualblocks plugin that shows html5 blocks with visual borders.
+ Added new types and selector options to make it easier to create editor instances with different configs.
+ Added new preview of formatting options in various listboxes.
+ Added new preview_styles option that enables control over what gets previewed.
+ Fixed bug where content css would be loaded twice into iframe.
+ Fixed bug where start elements with only whitespace in the attribute part wouldn't be correctly parsed.
+ Fixed bug where the advlink dialog would produce an error about the addSelectAccessibility function not being defined.
+ Fixed bug where the caret would be placed at an incorrect position if span was removed by the invalid_elements setting.
+ Fixed bug where elements inside a white space preserve element like pre didn't inherit the behavior while parsing.
+Version 3.4.9 (2012-02-23)
+ Added settings to wordcount plugin to configure update rate and checking wordcount on backspace and delete using wordcount_update_rate and wordcount_update_on_delete.
+ Fixed bug in Webkit and IE where deleting empty paragraphs would remove entire editor contents.
+ Fixed bug where pressing enter on end of list item with a heading would create a new item with heading.
+ Fixed edit css style dialog text-decoration none checkbox so it disables other text-decoration options when enabled.
+ Fixed bug in Gecko where undo wasn't added when focus was lost.
+ Fixed bug in Gecko where shift-enter in table cell ending with BR doesn't move caret to new line.
+ Fixed bug where right-click on formatted text in IE selected the entire line.
+ Fixed bug where text ending with space could not be unformatted in IE.
+ Fixed bug where caret formatting would be removed when moving the caret when a selector expression was used.
+ Fixed bug where formatting would be applied to the body element when all contents where selected and format had both inline and selector parts.
+ Fixed bug where the media plugin would throw errors if you had iframe set as an invalid element in config.
+ Fixed bug where the caret would be placed at the top of the document if you inserted a table and undo:ed that operation. Patch contributed by Wesley Walser.
+ Fixed bug where content css files where loaded twice into the iframe.
+ Fixed so elements with comments would be trated as non empty elements. Patch contributed by Arjan Scherpenisse.
Version 3.4.8 (2012-02-02)
Fixed bug in IE where selected text ending with space cannot be formatted then formatted again to get original text.
Fixed bug in IE where images larger than editor area were being deselected when toolbar buttons are clicked.
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/en.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/en.js 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/langs/en.js 2012-06-24 17:15:30 UTC (rev 9704)
@@ -1 +1 @@
-tinyMCE.addI18n({en:{common:{"more_colors":"More Colors...","invalid_data":"Error: Invalid values entered, these are marked in red.","popup_blocked":"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.","clipboard_no_support":"Currently not supported by your browser, use keyboard shortcuts instead.","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","not_set":"-- Not Set --","class_name":"Class",browse:"Browse",close:"Close",cancel:"Cancel",update:"Update",insert:"Insert",apply:"Apply","edit_confirm":"Do you want to use the WYSIWYG mode for this textarea?","invalid_data_number":"{#field} must be a number","invalid_data_min":"{#field} must be a number greater than {#min}","invalid_data_size":"{#field} must be a number or percentage",value:"(value)"},contextmenu:{full:"Full",right:"Right",center:"Center",left:"Left",align:"Alignment"},insertdatetime:{"day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","inserttime_desc":"Insert Time","insertdate_desc":"Insert Date","time_fmt":"%H:%M:%S","date_fmt":"%Y-%m-%d"},print:{"print_desc":"Print"},preview:{"preview_desc":"Preview"},directionality:{"rtl_desc":"Direction Right to Left","ltr_desc":"Direction Left to Right"},layer:{content:"New layer...","absolute_desc":"Toggle Absolute Positioning","backward_desc":"Move Backward","forward_desc":"Move Forward","insertlayer_desc":"Insert New Layer"},save:{"save_desc":"Save","cancel_desc":"Cancel All Changes"},nonbreaking:{"nonbreaking_desc":"Insert Non-Breaking Space Character"},iespell:{download:"ieSpell not detected. Do you want to install it now?","iespell_desc":"Check Spelling"},advhr:{"delta_height":"","delta_width":"","advhr_desc":"Insert Horizontal Line"},emotions:{"delta_height":"","delta_width":"","emotions_desc":"Emotions"},searchreplace:{"replace_desc":"Find/Replace","delta_width":"","delta_height":"","search_desc":"Find"},advimage:{"delta_width":"","image_desc":"Insert/Edit Image","delta_height":""},advlink:{"delta_height":"","delta_width":"","link_desc":"Insert/Edit Link"},xhtmlxtras:{"attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":"","attribs_desc":"Insert/Edit Attributes","ins_desc":"Insertion","del_desc":"Deletion","acronym_desc":"Acronym","abbr_desc":"Abbreviation","cite_desc":"Citation"},style:{"delta_height":"","delta_width":"",desc:"Edit CSS Style"},paste:{"plaintext_mode_stick":"Paste is now in plain text mode. Click again to toggle back to regular paste mode.","plaintext_mode":"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.","selectall_desc":"Select All","paste_word_desc":"Paste from Word","paste_text_desc":"Paste as Plain Text"},"paste_dlg":{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."},table:{"merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":"",cell:"Cell",col:"Column",row:"Row",del:"Delete Table","copy_row_desc":"Copy Table Row","cut_row_desc":"Cut Table Row","paste_row_after_desc":"Paste Table Row After","paste_row_before_desc":"Paste Table Row Before","props_desc":"Table Properties","cell_desc":"Table Cell Properties","row_desc":"Table Row Properties","merge_cells_desc":"Merge Table Cells","split_cells_desc":"Split Merged Table Cells","delete_col_desc":"Delete Column","col_after_desc":"Insert Column After","col_before_desc":"Insert Column Before","delete_row_desc":"Delete Row","row_after_desc":"Insert Row After","row_before_desc":"Insert Row Before",desc:"Insert/Edit Table"},autosave:{"warning_message":"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?","restore_content":"Restore auto-saved content.","unload_msg":"The changes you made will be lost if you navigate away from this page."},fullscreen:{desc:"Toggle Full Screen Mode"},media:{"delta_height":"","delta_width":"",edit:"Edit Embedded Media",desc:"Insert/Edit Embedded Media"},fullpage:{desc:"Document Properties","delta_width":"","delta_height":""},template:{desc:"Insert Predefined Template Content"},visualchars:{desc:"Show/Hide Visual Control Characters"},spellchecker:{desc:"Toggle Spell Checker",menu:"Spell Checker Settings","ignore_word":"Ignore Word","ignore_words":"Ignore All",langs:"Languages",wait:"Please wait...",sug:"Suggestions","no_sug":"No Suggestions","no_mpell":"No misspellings found.","learn_word":"Learn word"},pagebreak:{desc:"Insert Page Break for Printing"},advlist:{types:"Types",def:"Default","lower_alpha":"Lower Alpha","lower_greek":"Lower Greek","lower_roman":"Lower Roman","upper_alpha":"Upper Alpha","upper_roman":"Upper Roman",circle:"Circle",disc:"Disc",square:"Square"},colors:{"333300":"Dark olive","993300":"Burnt orange","000000":"Black","003300":"Dark green","003366":"Dark azure","000080":"Navy Blue","333399":"Indigo","333333":"Very dark gray","800000":"Maroon",FF6600:"Orange","808000":"Olive","008000":"Green","008080":"Teal","0000FF":"Blue","666699":"Grayish blue","808080":"Gray",FF0000:"Red",FF9900:"Amber","99CC00":"Yellow green","339966":"Sea green","33CCCC":"Turquoise","3366FF":"Royal blue","800080":"Purple","999999":"Medium gray",FF00FF:"Magenta",FFCC00:"Gold",FFFF00:"Yellow","00FF00":"Lime","00FFFF":"Aqua","00CCFF":"Sky blue","993366":"Brown",C0C0C0:"Silver",FF99CC:"Pink",FFCC99:"Peach",FFFF99:"Light yellow",CCFFCC:"Pale green",CCFFFF:"Pale cyan","99CCFF":"Light sky blue",CC99FF:"Plum",FFFFFF:"White"},aria:{"rich_text_area":"Rich Text Area"},wordcount:{words:"Words:"}}});
\ No newline at end of file
+tinyMCE.addI18n({en:{common:{"more_colors":"More Colors...","invalid_data":"Error: Invalid values entered, these are marked in red.","popup_blocked":"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.","clipboard_no_support":"Currently not supported by your browser, use keyboard shortcuts instead.","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","not_set":"-- Not Set --","class_name":"Class",browse:"Browse",close:"Close",cancel:"Cancel",update:"Update",insert:"Insert",apply:"Apply","edit_confirm":"Do you want to use the WYSIWYG mode for this textarea?","invalid_data_number":"{#field} must be a number","invalid_data_min":"{#field} must be a number greater than {#min}","invalid_data_size":"{#field} must be a number or percentage",value:"(value)"},contextmenu:{full:"Full",right:"Right",center:"Center",left:"Left",align:"Alignment"},insertdatetime:{"day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","inserttime_desc":"Insert Time","insertdate_desc":"Insert Date","time_fmt":"%H:%M:%S","date_fmt":"%Y-%m-%d"},print:{"print_desc":"Print"},preview:{"preview_desc":"Preview"},directionality:{"rtl_desc":"Direction Right to Left","ltr_desc":"Direction Left to Right"},layer:{content:"New layer...","absolute_desc":"Toggle Absolute Positioning","backward_desc":"Move Backward","forward_desc":"Move Forward","insertlayer_desc":"Insert New Layer"},save:{"save_desc":"Save","cancel_desc":"Cancel All Changes"},nonbreaking:{"nonbreaking_desc":"Insert Non-Breaking Space Character"},iespell:{download:"ieSpell not detected. Do you want to install it now?","iespell_desc":"Check Spelling"},advhr:{"delta_height":"","delta_width":"","advhr_desc":"Insert Horizontal Line"},emotions:{"delta_height":"","delta_width":"","emotions_desc":"Emotions"},searchreplace:{"replace_desc":"Find/Replace","delta_width":"","delta_height":"","search_desc":"Find"},advimage:{"delta_width":"","image_desc":"Insert/Edit Image","delta_height":""},advlink:{"delta_height":"","delta_width":"","link_desc":"Insert/Edit Link"},xhtmlxtras:{"attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":"","attribs_desc":"Insert/Edit Attributes","ins_desc":"Insertion","del_desc":"Deletion","acronym_desc":"Acronym","abbr_desc":"Abbreviation","cite_desc":"Citation"},style:{"delta_height":"","delta_width":"",desc:"Edit CSS Style"},paste:{"plaintext_mode_stick":"Paste is now in plain text mode. Click again to toggle back to regular paste mode.","plaintext_mode":"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.","selectall_desc":"Select All","paste_word_desc":"Paste from Word","paste_text_desc":"Paste as Plain Text"},"paste_dlg":{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."},table:{"merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":"",cell:"Cell",col:"Column",row:"Row",del:"Delete Table","copy_row_desc":"Copy Table Row","cut_row_desc":"Cut Table Row","paste_row_after_desc":"Paste Table Row After","paste_row_before_desc":"Paste Table Row Before","props_desc":"Table Properties","cell_desc":"Table Cell Properties","row_desc":"Table Row Properties","merge_cells_desc":"Merge Table Cells","split_cells_desc":"Split Merged Table Cells","delete_col_desc":"Delete Column","col_after_desc":"Insert Column After","col_before_desc":"Insert Column Before","delete_row_desc":"Delete Row","row_after_desc":"Insert Row After","row_before_desc":"Insert Row Before",desc:"Insert/Edit Table"},autosave:{"warning_message":"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?","restore_content":"Restore auto-saved content.","unload_msg":"The changes you made will be lost if you navigate away from this page."},fullscreen:{desc:"Toggle Full Screen Mode"},media:{"delta_height":"","delta_width":"",edit:"Edit Embedded Media",desc:"Insert/Edit Embedded Media"},fullpage:{desc:"Document Properties","delta_width":"","delta_height":""},template:{desc:"Insert Predefined Template Content"},visualchars:{desc:"Show/Hide Visual Control Characters"},spellchecker:{desc:"Toggle Spell Checker",menu:"Spell Checker Settings","ignore_word":"Ignore Word","ignore_words":"Ignore All",langs:"Languages",wait:"Please wait...",sug:"Suggestions","no_sug":"No Suggestions","no_mpell":"No misspellings found.","learn_word":"Learn word"},pagebreak:{desc:"Insert Page Break for Printing"},advlist:{types:"Types",def:"Default","lower_alpha":"Lower Alpha","lower_greek":"Lower Greek","lower_roman":"Lower Roman","upper_alpha":"Upper Alpha","upper_roman":"Upper Roman",circle:"Circle",disc:"Disc",square:"Square"},colors:{"333300":"Dark olive","993300":"Burnt orange","000000":"Black","003300":"Dark green","003366":"Dark azure","000080":"Navy Blue","333399":"Indigo","333333":"Very dark gray","800000":"Maroon",FF6600:"Orange","808000":"Olive","008000":"Green","008080":"Teal","0000FF":"Blue","666699":"Grayish blue","808080":"Gray",FF0000:"Red",FF9900:"Amber","99CC00":"Yellow green","339966":"Sea green","33CCCC":"Turquoise","3366FF":"Royal blue","800080":"Purple","999999":"Medium gray",FF00FF:"Magenta",FFCC00:"Gold",FFFF00:"Yellow","00FF00":"Lime","00FFFF":"Aqua","00CCFF":"Sky blue","993366":"Brown",C0C0C0:"Silver",FF99CC:"Pink",FFCC99:"Peach",FFFF99:"Light yellow",CCFFCC:"Pale green",CCFFFF:"Pale cyan","99CCFF":"Light sky blue",CC99FF:"Plum",FFFFFF:"White"},aria:{"rich_text_area":"Rich Text Area"},wordcount:{words:"Words:"},visualblocks:{desc:'Show/hide block elements'}}});
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js 2012-06-24 17:15:30 UTC (rev 9704)
@@ -488,7 +488,7 @@
var html = "";
html += '<select id="' + elm_id + '" name="' + elm_id + '"';
- html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+ html += ' class="mceLinkList" onchange="this.form.' + target_form_element + '.value=';
html += 'this.options[this.selectedIndex].value;';
if (typeof(onchange_func) != "undefined")
@@ -510,7 +510,7 @@
var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
var html = '';
- html += '<select id="' + elm_id + '" name="' + elm_id + '" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+ html += '<select id="' + elm_id + '" name="' + elm_id + '" onchange="this.form.' + target_form_element + '.value=';
html += 'this.options[this.selectedIndex].value;">';
html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js 2012-06-24 17:15:30 UTC (rev 9704)
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])&&!/^mailto:/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);i.nodeChanged();if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js 2012-06-24 17:15:30 UTC (rev 9704)
@@ -1 +1 @@
-(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s| |<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,j=h.storage,i;if(j){i=j.getItem(h.key);if(i){h.editor.setContent(i);h.onRestoreDraft.dispatch(h,{content:i})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s| |<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){if(!i.removed){h.storeDraft();i.nodeChanged()}},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,j=h.storage,i;if(j){i=j.getItem(h.key);if(i){h.editor.setContent(i);h.onRestoreDraft.dispatch(h,{content:i})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js 2012-06-24 17:15:30 UTC (rev 9704)
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(e){var h=this,f,d,i;h.editor=e;d=e.settings.contextmenu_never_use_native;h.onContextMenu=new tinymce.util.Dispatcher(this);f=e.onContextMenu.add(function(j,k){if((i!==0?i:k.ctrlKey)&&!d){return}a.cancel(k);if(k.target.nodeName=="IMG"){j.selection.select(k.target)}h._getMenu(j).showMenu(k.clientX||k.pageX,k.clientY||k.pageY);a.add(j.getDoc(),"click",function(l){g(j,l)});j.nodeChanged()});e.onRemove.add(function(){if(h._menu){h._menu.removeAll()}});function g(j,k){i=0;if(k&&k.button==2){i=k.ctrlKey;return}if(h._menu){h._menu.removeAll();h._menu.destroy();a.remove(j.getDoc(),"click",g);h._menu=null}}e.onMouseDown.add(g);e.onKeyDown.add(g);e.onKeyDown.add(function(j,k){if(k.shiftKey&&!k.ctrlKey&&!k.altKey&&k.keyCode===121){a.cancel(k);f(j,k)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(f){var i=this,g,d,j,e;i.editor=f;d=f.settings.contextmenu_never_use_native;i.onContextMenu=new tinymce.util.Dispatcher(this);e=function(k){h(f,k)};g=f.onContextMenu.add(function(k,l){if((j!==0?j:l.ctrlKey)&&!d){return}a.cancel(l);if(l.target.nodeName=="IMG"){k.selection.select(l.target)}i._getMenu(k).showMenu(l.clientX||l.pageX,l.clientY||l.pageY);a.add(k.getDoc(),"click",e);k.nodeChanged()});f.onRemove.add(function(){if(i._menu){i._menu.removeAll()}});function h(k,l){j=0;if(l&&l.button==2){j=l.ctrlKey;return}if(i._menu){i._menu.removeAll();i._menu.destroy();a.remove(k.getDoc(),"click",e);i._menu=null}}f.onMouseDown.add(h);f.onKeyDown.add(h);f.onKeyDown.add(function(k,l){if(l.shiftKey&&!l.ctrlKey&&!l.altKey&&l.keyCode===121){a.cancel(l);g(k,l)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js 2012-06-24 16:15:33 UTC (rev 9703)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js 2012-06-24 17:15:30 UTC (rev 9704)
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settin...
[truncated message content] |
|
From: <ma...@us...> - 2012-06-24 16:15:39
|
Revision: 9703
http://xoops.svn.sourceforge.net/xoops/?rev=9703&view=rev
Author: mageg
Date: 2012-06-24 16:15:33 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Changing the theme to display banners
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html 2012-06-24 16:14:34 UTC (rev 9702)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html 2012-06-24 16:15:33 UTC (rev 9703)
@@ -22,13 +22,20 @@
</div>
<div class="xo-hero">
<div class="container xo-hero-content">
- <h1>XOOPS. Powered by You!</h1>
- <p>easy to use dynamic web content management system written in PHP</p>
- <p>
- <a class="btn btn-warning btn-large">
- Learn more
- </a>
- </p>
+ <div class="row">
+ <div class="span7">
+ <h1>XOOPS. Powered by You!</h1>
+ <p>easy to use dynamic web content management system written in PHP</p>
+ <p>
+ <a class="btn btn-warning btn-large">
+ Learn more
+ </a>
+ </p>
+ </div>
+ <div class="span5">
+ <{$xoops_banner}>
+ </div>
+ </div>
</div>
</div>
<div class="container">
@@ -62,7 +69,7 @@
<{/foreach}>
<!-- End center-left blocks loop -->
</div>
- <{if $col_span_mid == 4}><div class="span1"> </div><{/if}>
+ <{if $col_span_mid == 4}><div class="span1"> </div><{/if}>
<div class="span<{$col_span_mid}> xo-right">
<!-- Start center-right blocks loop -->
<{foreach item=block from=$xoBlocks.page_topright}>
@@ -102,7 +109,7 @@
<{/foreach}>
<!-- End center-left blocks loop -->
</div>
- <{if $col_span_mid == 4}><div class="span1"> </div><{/if}>
+ <{if $col_span_mid == 4}><div class="span1"> </div><{/if}>
<div class="span<{$col_span_mid}> xo-right">
<!-- Start center-right blocks loop -->
<{foreach item=block from=$xoBlocks.page_bottomright}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
