Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8545] XoopsCore/trunk
|
From: <be...@us...> - 2011-12-25 22:52:29
|
Revision: 8545
http://xoops.svn.sourceforge.net/xoops/?rev=8545&view=rev
Author: beckmi
Date: 2011-12-25 22:52:19 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Updating Trunk to XOOPS 2.5.0 RC 1
Modified Paths:
--------------
XoopsCore/trunk/docs/changelog.250.txt
XoopsCore/trunk/htdocs/class/logger/xoopslogger.php
XoopsCore/trunk/htdocs/class/xoopseditor/textarea/editor_registry.php
XoopsCore/trunk/htdocs/include/defines.php
XoopsCore/trunk/htdocs/include/version.php
XoopsCore/trunk/htdocs/install/css/style.css
XoopsCore/trunk/htdocs/install/include/config.php
XoopsCore/trunk/htdocs/install/include/makedata.php
XoopsCore/trunk/htdocs/install/language/english/install.php
XoopsCore/trunk/htdocs/install/language/english/welcome.php
XoopsCore/trunk/htdocs/install/sql/mysql.structure.sql
XoopsCore/trunk/htdocs/modules/pm/sql/mysql.sql
XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html
XoopsCore/trunk/htdocs/modules/profile/sql/mysql.sql
XoopsCore/trunk/htdocs/modules/profile/templates/style.css
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/trunk/htdocs/modules/system/admin.php
XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/trunk/htdocs/modules/system/class/group.php
XoopsCore/trunk/htdocs/modules/system/class/users.php
XoopsCore/trunk/htdocs/modules/system/images/icons/default/delete.png
XoopsCore/trunk/htdocs/modules/system/images/icons/default/display.png
XoopsCore/trunk/htdocs/modules/system/images/icons/default/edit.png
XoopsCore/trunk/htdocs/modules/system/js/admin.js
XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/modulesadmin.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin.php
XoopsCore/trunk/htdocs/modules/system/language/english/blocks.php
XoopsCore/trunk/htdocs/modules/system/language/english/cpanel.php
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_index.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules_confirm.html
XoopsCore/trunk/htdocs/modules/system/themes/default/css/content.css
XoopsCore/trunk/htdocs/modules/system/themes/default/css/dark.css
XoopsCore/trunk/htdocs/modules/system/themes/default/css/footer.css
XoopsCore/trunk/htdocs/modules/system/themes/default/css/globalnav.css
XoopsCore/trunk/htdocs/modules/system/themes/default/css/reset.css
XoopsCore/trunk/htdocs/modules/system/themes/default/css/silver.css
XoopsCore/trunk/htdocs/modules/system/themes/default/language/english/admin.php
XoopsCore/trunk/htdocs/themes/suico/xotpl/xo_scripts.html
XoopsCore/trunk/htdocs/xmlrpc.php
XoopsCore/trunk/htdocs/xoops.css
XoopsCore/trunk/htdocs/xoops_data/data/secure.dist.php
XoopsCore/trunk/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.ui.js
XoopsCore/trunk/upgrade/check_version.php
XoopsCore/trunk/upgrade/cnt-2.2.x-to-2.3.0/language/english.php
XoopsCore/trunk/upgrade/login.php
XoopsCore/trunk/upgrade/style.css
XoopsCore/trunk/upgrade/upd-2.0.18-to-2.3.0/mysql.structure.sql
XoopsCore/trunk/upgrade/upd-2.0.18-to-2.3.0/settings_path.php
XoopsCore/trunk/upgrade/upgrade_tpl.php
Added Paths:
-----------
XoopsCore/trunk/htdocs/images/img_errors.png
XoopsCore/trunk/htdocs/install/img/xoops_2.5.0-RC.png
XoopsCore/trunk/htdocs/modules/protector/
XoopsCore/trunk/htdocs/modules/system/images/icons/default/print_printer.png
XoopsCore/trunk/htdocs/xoops_lib/modules/
XoopsCore/trunk/upgrade/font/
XoopsCore/trunk/upgrade/img/xoops_logo.png
XoopsCore/trunk/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/
XoopsCore/trunk/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/index.php
XoopsCore/trunk/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/license.dist.php
XoopsCore/trunk/upgrade/upd-2.4.x-to-2.5.0/
Removed Paths:
-------------
XoopsCore/trunk/htdocs/install/img/xoops_2.5.0-Beta.png
XoopsCore/trunk/htdocs/modules/protector/
XoopsCore/trunk/htdocs/themes/suico/js/IE8.js
XoopsCore/trunk/htdocs/themes/suico/js/jquery.ui-1.7.min.js
XoopsCore/trunk/htdocs/xoops_lib/modules/
XoopsCore/trunk/upgrade/img/banner_bg.png
XoopsCore/trunk/upgrade/img/logo.png
XoopsCore/trunk/upgrade/img/no.png
XoopsCore/trunk/upgrade/img/yes.png
Property Changed:
----------------
XoopsCore/trunk/
Property changes on: XoopsCore/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /XoopsCore/branches/2.4.x/2.4.4:4083-4170
/XoopsCore/branches/2.4.x/2.4.5:4294-4943
/XoopsCore/branches/2.5.x/2.5.0:5408
/XoopsCore/branches/tasks/2.5.0-formuss-trabis:4945-5404
/XoopsCore/releases/2.5.0-beta:5409-8543
+ /XoopsCore/branches/2.4.x/2.4.4:4083-4170
/XoopsCore/branches/2.4.x/2.4.5:4294-4943
/XoopsCore/branches/2.5.x/2.5.0:5408-5536
/XoopsCore/branches/tasks/2.5.0-formuss-trabis:4945-5535
/XoopsCore/releases/2.5.0-beta:5409-8543
/XoopsCore/releases/2.5.0-rc:5537-8544
Modified: XoopsCore/trunk/docs/changelog.250.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.250.txt 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/docs/changelog.250.txt 2011-12-25 22:52:19 UTC (rev 8545)
@@ -1,7 +1,13 @@
===============================
-2010/09/18: Version 2.5.0
+Updated 2010/10/17: Version 2.5.0
===============================
Bug Fixes:
+ - ID: 3089455 (wrong width in Profile Style.css) (Mamba)
+ - ID: 3081037 (Updated PHP & MySQL requirementes) (Anderssk/Mamba)
+ - ID: 3089251 (Checkboxes in Block Accees not working) (Mamba/Formuss)
+ - ID: 3085003 (Info buttons not linked) (Mamba/Formuss)
+ - ID: 3084587 (Typo in xmlrpc.php) (Wishcraft/Mamba)
+ - ID: 3000221 (TYPE=MyISAM replaced by ENGINE=MyISAM) (Ghia/Mamba)
- Division by zero in banners.php (trabis)
- $myts not defined in banners.php (trabis)
- function xoops_getbanner() may delete a newly created banner (trabis)
@@ -40,6 +46,8 @@
- cosmetic cleaning / generic class in php files (kris_fr)
- add xoops.css to system_imagemanager.html (kris_fr)
- add imagemanager.css for imagemanager.html (voltan)
+ - redesign fatal error message (kris_fr)
+ - redesign upgrade process (kris_fr)
XOOPS:
- user.php: User page
@@ -73,6 +81,8 @@
* Change folder location
System module:
+ - /modules/system/admin/modulesadmin/modulesadmin.php
+ * Adding extra module-related links to the just installed modules (Add) Mamba
- modules/system/header.php: System constants (Add)
* use specific header for all system module
- modules/system/admin.php: Admin main page (Modify)
@@ -91,6 +101,8 @@
* Change path to admin theme
- modules/system/xoops_version.php: System setting (Modify)
* Clean code and add admin template and system settings
+ - modules/system/blocks/system_blocks.php (Modify)
+ * Add waiting content for some modules
pm module:
* Changing the admin menu. Using the menu generated by the module system
Modified: XoopsCore/trunk/htdocs/class/logger/xoopslogger.php
===================================================================
--- XoopsCore/trunk/htdocs/class/logger/xoopslogger.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/class/logger/xoopslogger.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -210,7 +210,7 @@
}
echo sprintf(_XOOPS_FATAL_MESSAGE, $errstr);
if ($trace && function_exists('debug_backtrace')) {
- echo "<div style='color:#fff;background-color:#fff'>" . _XOOPS_FATAL_BACKTRACE . ":<br />";
+ echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>" . _XOOPS_FATAL_BACKTRACE . ":<br />";
$trace = debug_backtrace();
array_shift($trace);
foreach ($trace as $step) {
Modified: XoopsCore/trunk/htdocs/class/xoopseditor/textarea/editor_registry.php
===================================================================
--- XoopsCore/trunk/htdocs/class/xoopseditor/textarea/editor_registry.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/class/xoopseditor/textarea/editor_registry.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -20,7 +20,7 @@
"class" => "FormTextArea",
"file" => XOOPS_ROOT_PATH . "/class/xoopseditor/textarea/textarea.php",
"title" => _XOOPS_EDITOR_TEXTAREA, // display to end user
- "order" => 2, // 0 will disable the editor
+ "order" => 1, // 0 will disable the editor
"nohtml" => 1 // For forms that have "dohtml" disabled
);
?>
\ No newline at end of file
Copied: XoopsCore/trunk/htdocs/images/img_errors.png (from rev 8544, XoopsCore/releases/2.5.0-rc/htdocs/images/img_errors.png)
===================================================================
(Binary files differ)
Modified: XoopsCore/trunk/htdocs/include/defines.php
===================================================================
--- XoopsCore/trunk/htdocs/include/defines.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/include/defines.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -70,10 +70,48 @@
/*
* Some language definitions that cannot be translated
*/
-define('_XOOPS_FATAL_MESSAGE', "
- This page cannot be displayed due to an internal error.<br/><br/>
- You can provide the following information to the administrators of this site to help them solve the problem:<br /><br />
- Error: %s<br />"
+define('_XOOPS_FATAL_MESSAGE', "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+<meta http-equiv='Content-Type' content='text/html; charset=utf-8;charset=utf-8' />
+<title>Internal server error</title>
+<style type='text/css'>
+* { margin: 0; padding: 0; font-family: Arial, Helvetica, sans-serif;}
+body {font-size: 12px; background-color: #f0f0f0; text-align: center;}
+#xo-siteblocked {
+ border: 1px solid #c0c4c0;
+ width: 375px;
+ height: 318px;
+ margin: 150px auto;
+ text-align: center;
+ background-color: #fff;
+ background-image: url(images/img_errors.png);
+ background-repeat: no-repeat;
+ background-position: 30px 50px;
+ padding-left: 300px;
+ padding-right: 30px;
+ border-radius: 15px;
+ -moz-border-radius: 15px;
+ -webkit-border-radius: 15px;
+}
+ #xo-siteblocked h1 {font-size: 1.7em; margin: 45px 0 30px 0;}
+ #xo-siteblocked h2 {font-size: 1.5em; margin: 0 0 30px 0;}
+ #xo-siteblocked h1, h2 {font-weight: normal; text-shadow: 1px 1px 2px #ccc;}
+ #xo-siteblocked a, #xo-siteblocked a:visited {color: #2cb0ff; text-decoration: none;}
+ #xo-siteblocked p { font-size: 1.3em; margin-top: 12px; line-height: 2em;}
+ #xo-siteblocked p.xo-siteblocked-message { height: 70px;}
+ #xo-siteblocked p.xo-siteblocked-desc { font-size: .9em; font-style: italic; margin-top: 25px;}
+</style>
+</head>
+<body>
+ <div id='xo-siteblocked'>
+ <h1>A problem has occurred on our server!</h1>
+ <h2>Page is currently unavailable</h2>
+ <p class='xo-siteblocked-message'>We are treating the incident<br /><a href='/'>Please, coming soon ...</a></p>
+ <p class='xo-siteblocked-desc'>Error : %s</p>
+ </div>
+</body>
+</html>"
);
define('_XOOPS_FATAL_BACKTRACE', "Backtrace");
Modified: XoopsCore/trunk/htdocs/include/version.php
===================================================================
--- XoopsCore/trunk/htdocs/include/version.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/include/version.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -30,6 +30,6 @@
/**
* Define XOOPS engine version
*/
-define('XOOPS_VERSION', 'XOOPS 2.5.0-Beta');
+define('XOOPS_VERSION', 'XOOPS 2.5.0-RC');
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/install/css/style.css
===================================================================
--- XoopsCore/trunk/htdocs/install/css/style.css 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/install/css/style.css 2011-12-25 22:52:19 UTC (rev 8545)
@@ -34,11 +34,13 @@
}
#xo-version {
float: right;
- margin: 8px;
- color: #DFC861;
+ margin: 16px 8px;
+ color: #aaa;
font-weight: bold;
font-size: 2em;
+ text-shadow: 1px 1px 2px #ccc;
}
+#xo-version img {margin-top: -8px;}
#xo-support {
float: right;
margin-right: 10px;
@@ -594,4 +596,5 @@
color: #FF0000;
font-weight: bold;
background-color: transparent;
-}
\ No newline at end of file
+}
+.noininstall {display: none;}
\ No newline at end of file
Deleted: XoopsCore/trunk/htdocs/install/img/xoops_2.5.0-Beta.png
===================================================================
(Binary files differ)
Copied: XoopsCore/trunk/htdocs/install/img/xoops_2.5.0-RC.png (from rev 8544, XoopsCore/releases/2.5.0-rc/htdocs/install/img/xoops_2.5.0-RC.png)
===================================================================
(Binary files differ)
Modified: XoopsCore/trunk/htdocs/install/include/config.php
===================================================================
--- XoopsCore/trunk/htdocs/install/include/config.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/install/include/config.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -49,7 +49,7 @@
);
// Writable files and directories
-$configs['writable'] = array('uploads/', 'uploads/avatars/', 'uploads/images/', 'uploads/ranks/', 'uploads/smilies/', 'mainfile.php', 'include/license.php', 'xoops_data\data\secure.php');
+$configs['writable'] = array('uploads/', 'uploads/avatars/', 'uploads/images/', 'uploads/ranks/', 'uploads/smilies/', 'mainfile.php', 'include/license.php', 'xoops_data/data/secure.php');
// Modules to be installed by default
$configs['modules'] = array();
Modified: XoopsCore/trunk/htdocs/install/include/makedata.php
===================================================================
--- XoopsCore/trunk/htdocs/install/include/makedata.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/install/include/makedata.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -188,7 +188,7 @@
$dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
$dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '" . addslashes(serialize(array('127.0.0.1'))) . "', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
$dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
- $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS @ 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
+ $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS @ 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net/\" rel=\"external\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
$dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
$dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize(array('fuck', 'shit'))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
$dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
Modified: XoopsCore/trunk/htdocs/install/language/english/install.php
===================================================================
--- XoopsCore/trunk/htdocs/install/language/english/install.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/install/language/english/install.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -130,7 +130,7 @@
define( "READY_INSERT_DATA", "The installer is now ready to insert initial data into your database." );
define( "READY_SAVE_MAINFILE", "The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed." );
define( "SAVED_MAINFILE", "Saved settings in mainfile.php" );
-define( "SAVED_MAINFILE_MSG", "The installer has saved the specified settings to <em>mainfile.php</em>. Press <em>next</em> to go to the next step." );
+define( "SAVED_MAINFILE_MSG", "The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step." );
define( "DATA_ALREADY_INSERTED", "XOOPS data found in database.<br />Press <em>next</em> to go to the next step." );
define( "DATA_INSERTED", "Initial data have been inserted into database.<br />Press <em>next</em> to go to the next step." );
Modified: XoopsCore/trunk/htdocs/install/language/english/welcome.php
===================================================================
--- XoopsCore/trunk/htdocs/install/language/english/welcome.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/install/language/english/welcome.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -19,8 +19,8 @@
<h3>Requirements</h3>
<ul>
<li>WWW Server (<a href="http://www.apache.org/" rel="external">Apache</a>, IIS, Roxen, etc)</li>
- <li><a href="http://www.php.net/" rel="external">PHP</a> 4.3.0 or higher (5.2 or higher recommended)</li>
- <li><a href="http://www.mysql.com/" rel="external">MySQL</a> 3.23 or higher (4.1 or higher recommended)</li>
+ <li><a href="http://www.php.net/" rel="external">PHP</a> 5.2 or higher </li>
+ <li><a href="http://www.mysql.com/" rel="external">MySQL</a> 5.1 or higher </li>
</ul>
<h3>Before you install</h3>
<ol>
Modified: XoopsCore/trunk/htdocs/install/sql/mysql.structure.sql
===================================================================
--- XoopsCore/trunk/htdocs/install/sql/mysql.structure.sql 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/install/sql/mysql.structure.sql 2011-12-25 22:52:19 UTC (rev 8545)
@@ -13,7 +13,7 @@
avatar_type char(1) NOT NULL default '',
PRIMARY KEY (avatar_id),
KEY avatar_type (avatar_type, avatar_display)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -24,7 +24,7 @@
avatar_id mediumint(8) unsigned NOT NULL default '0',
user_id mediumint(8) unsigned NOT NULL default '0',
KEY avatar_user_id (avatar_id,user_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -45,7 +45,7 @@
PRIMARY KEY (bid),
KEY idxbannercid (cid),
KEY idxbannerbidcid (bid,cid)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -62,7 +62,7 @@
extrainfo text,
PRIMARY KEY (cid),
KEY login (login)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -78,7 +78,7 @@
dateend int(10) unsigned NOT NULL default '0',
PRIMARY KEY (bid),
KEY cid (cid)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -89,7 +89,7 @@
block_id mediumint(8) unsigned NOT NULL default '0',
module_id smallint(5) NOT NULL default '0',
PRIMARY KEY (`module_id`, `block_id`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -123,7 +123,7 @@
KEY com_uid (com_uid),
KEY com_title (com_title(40)),
KEY com_status (com_status)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
# RMV-NOTIFY
@@ -144,7 +144,7 @@
KEY not_class (not_category),
KEY not_uid (not_uid),
KEY not_event (not_event)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -165,7 +165,7 @@
PRIMARY KEY (conf_id),
KEY conf_mod_cat_id (conf_modid, conf_catid),
KEY conf_order (conf_order)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -177,7 +177,7 @@
confcat_name varchar(255) NOT NULL default '',
confcat_order smallint(5) unsigned NOT NULL default '0',
PRIMARY KEY (confcat_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -191,7 +191,7 @@
conf_id smallint(5) unsigned NOT NULL default '0',
PRIMARY KEY (confop_id),
KEY conf_id (conf_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -206,7 +206,7 @@
PRIMARY KEY (groupid),
KEY group_type (group_type)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -223,7 +223,7 @@
KEY groupid (gperm_groupid),
KEY itemid (gperm_itemid),
KEY gperm_modid (gperm_modid,gperm_name(10))
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
@@ -237,7 +237,7 @@
uid mediumint(8) unsigned NOT NULL default '0',
PRIMARY KEY (linkid),
KEY groupid_uid (groupid,uid)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -256,7 +256,7 @@
PRIMARY KEY (image_id),
KEY imgcat_id (imgcat_id),
KEY image_display (image_display)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -267,7 +267,7 @@
image_id mediumint(8) unsigned NOT NULL default '0',
image_body mediumblob,
KEY image_id (image_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -286,7 +286,7 @@
imgcat_storetype varchar(5) NOT NULL default '',
PRIMARY KEY (imgcat_id),
KEY imgcat_display (imgcat_display)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
@@ -300,7 +300,7 @@
imgset_refid mediumint(8) unsigned NOT NULL default '0',
PRIMARY KEY (imgset_id),
KEY imgset_refid (imgset_refid)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -311,7 +311,7 @@
imgset_id smallint(5) unsigned NOT NULL default '0',
tplset_name varchar(50) NOT NULL default '',
KEY tplset_name (tplset_name(10))
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -325,7 +325,7 @@
imgsetimg_imgset smallint(5) unsigned NOT NULL default '0',
PRIMARY KEY (imgsetimg_id),
KEY imgsetimg_imgset (imgsetimg_imgset)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -356,7 +356,7 @@
KEY isactive (isactive),
KEY weight (weight),
KEY hascomments (hascomments)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -389,7 +389,7 @@
KEY visible (visible),
KEY isactive_visible_mid (isactive,visible,mid),
KEY mid_funcnum (mid,func_num)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -405,7 +405,7 @@
KEY online_module (online_module),
KEY online_updated (online_updated),
KEY online_uid (online_uid)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -425,7 +425,7 @@
KEY to_userid (to_userid),
KEY touseridreadmsg (to_userid,read_msg),
KEY msgidfromuserid (from_userid, msg_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -444,7 +444,7 @@
KEY rank_max (rank_max),
KEY rankminrankmaxranspecial (rank_min,rank_max,rank_special),
KEY rankspecial (rank_special)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -458,7 +458,7 @@
sess_data text,
PRIMARY KEY (sess_id),
KEY updated (sess_updated)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -472,7 +472,7 @@
emotion varchar(75) NOT NULL default '',
display tinyint(1) NOT NULL default '0',
PRIMARY KEY (id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -486,7 +486,7 @@
tplset_credits text,
tplset_created int(10) unsigned NOT NULL default '0',
PRIMARY KEY (tplset_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -506,7 +506,7 @@
PRIMARY KEY (tpl_id),
KEY tpl_refid (tpl_refid,tpl_type),
KEY tpl_tplset (tpl_tplset,tpl_file(10))
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -517,7 +517,7 @@
tpl_id mediumint(7) unsigned NOT NULL default '0',
tpl_source mediumtext,
KEY tpl_id (tpl_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
# Table structure for table `users`
@@ -561,7 +561,7 @@
KEY uiduname (uid,uname),
KEY unamepass (uname,pass),
KEY level (level)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
#
@@ -575,5 +575,5 @@
PRIMARY KEY (`cache_key`),
KEY `cache_expires` (`cache_expires`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
# --------------------------------------------------------
Modified: XoopsCore/trunk/htdocs/modules/pm/sql/mysql.sql
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/sql/mysql.sql 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/pm/sql/mysql.sql 2011-12-25 22:52:19 UTC (rev 8545)
@@ -18,4 +18,4 @@
KEY inbox (`to_userid`,`read_msg`),
KEY outbox (`from_userid`, `read_msg`),
KEY prune (`msg_time`, `read_msg`, `from_save`, `to_delete`)
-) TYPE=MyISAM;
\ No newline at end of file
+) ENGINE=MyISAM;
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html 2011-12-25 22:52:19 UTC (rev 8545)
@@ -1,6 +1,6 @@
<{$pmform.javascript}>
<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
- <table class='outer txtcenter' style='width:300px;'>
+ <table class='outer txtcenter width100'>
<tr>
<td class='head width30'><{$smarty.const._PM_TO}></td>
<td class='even'><{if $pmform.elements.to_userid.hidden != 1}><{$pmform.elements.to_userid.body}><{/if}><{$to_username}></td>
Modified: XoopsCore/trunk/htdocs/modules/profile/sql/mysql.sql
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/sql/mysql.sql 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/profile/sql/mysql.sql 2011-12-25 22:52:19 UTC (rev 8545)
@@ -5,7 +5,7 @@
`cat_weight` smallint(5) unsigned NOT NULL default '0',
PRIMARY KEY (`cat_id`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
CREATE TABLE `profile_field` (
`field_id` int(12) unsigned NOT NULL auto_increment,
@@ -29,7 +29,7 @@
PRIMARY KEY (`field_id`),
UNIQUE KEY `field_name` (`field_name`),
KEY `step` (`step_id`, `field_weight`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
CREATE TABLE `profile_visibility` (
`field_id` int(12) unsigned NOT NULL default '0',
@@ -38,7 +38,7 @@
PRIMARY KEY (`field_id`, `user_group`, `profile_group`),
KEY `visible` (`user_group`, `profile_group`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
CREATE TABLE `profile_regstep` (
`step_id` smallint(3) unsigned NOT NULL auto_increment,
@@ -49,10 +49,10 @@
PRIMARY KEY (`step_id`),
KEY `sort` (`step_order`, `step_name`)
-) Type=MyISAM;
+) ENGINE=MyISAM;
CREATE TABLE `profile_profile` (
`profile_id` int(12) unsigned NOT NULL default '0',
PRIMARY KEY (`profile_id`)
-) TYPE=MyISAM;
\ No newline at end of file
+) ENGINE=MyISAM;
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/profile/templates/style.css
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/templates/style.css 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/profile/templates/style.css 2011-12-25 22:52:19 UTC (rev 8545)
@@ -10,4 +10,4 @@
.profile-form td.head { width: 20%;}
.profile-list-category table { width: 80%; margin: 10px 5px;}
.profile-list-category td.head { width: 20%;}
-.profile-list-activity { width: .9em; padding: 5px;}
\ No newline at end of file
+.profile-list-activity { width: 90%; padding: 5px;}
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -87,10 +87,12 @@
$toinstall_mods = array();
$i=0;
foreach ($dirlist as $file) {
- clearstatcache();
- $file = trim($file);
- if ( !in_array($file, $install_mods) ) {
- $i++;
+ if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php' ) ) {
+ clearstatcache();
+ $file = trim($file);
+ if ( !in_array($file, $install_mods) ) {
+ $i++;
+ }
}
}
$xoopsTpl->assign('toinstall_nb', $i);
@@ -132,22 +134,24 @@
$toinstall_mods = array();
$i=0;
foreach ($dirlist as $file) {
- clearstatcache();
- $file = trim($file);
- if ( !in_array($file, $install_mods) ) {
- $module =& $module_handler->create();
- $module->loadInfo($file);
- $toinstall_mods[$i]['name'] = $module->getInfo('name');
- $toinstall_mods[$i]['dirname'] = $module->getInfo('dirname');
- $toinstall_mods[$i]['image'] = $module->getInfo('image');
- $toinstall_mods[$i]['version'] = round($module->getInfo('version'), 2);
- $toinstall_mods[$i]['author'] = $module->getInfo('author');
- $toinstall_mods[$i]['credits'] = $module->getInfo('credits');
- $toinstall_mods[$i]['license'] = $module->getInfo('license');
- $toinstall_mods[$i]['description'] = $module->getInfo('description');
- $toinstall_mods[$i]['mid'] = $i; // Use only for display popup
- unset($module);
- $i++;
+ if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php' ) ) {
+ clearstatcache();
+ $file = trim($file);
+ if ( !in_array($file, $install_mods) ) {
+ $module =& $module_handler->create();
+ $module->loadInfo($file);
+ $toinstall_mods[$i]['name'] = $module->getInfo('name');
+ $toinstall_mods[$i]['dirname'] = $module->getInfo('dirname');
+ $toinstall_mods[$i]['image'] = $module->getInfo('image');
+ $toinstall_mods[$i]['version'] = round($module->getInfo('version'), 2);
+ $toinstall_mods[$i]['author'] = $module->getInfo('author');
+ $toinstall_mods[$i]['credits'] = $module->getInfo('credits');
+ $toinstall_mods[$i]['license'] = $module->getInfo('license');
+ $toinstall_mods[$i]['description'] = $module->getInfo('description');
+ $toinstall_mods[$i]['mid'] = $i; // Use only for display popup
+ unset($module);
+ $i++;
+ }
}
}
$xoopsTpl->assign('toinstall_mods', $toinstall_mods);
@@ -273,7 +277,7 @@
//Set active modules in cache folder
xoops_setActiveModules();
// Define main template
- $xoopsOption['template_main'] = 'system_header.html';
+ $xoopsOption['template_main'] = 'system_modules_confirm.html';
// Call Header
xoops_cp_header();
// Define Stylesheet
@@ -284,11 +288,7 @@
$xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#submit' );
$xoBreadCrumb->render();
if ( count($ret) > 0 ) {
- foreach ($ret as $msg) {
- if ($msg != '') {
- echo $msg;
- }
- }
+ $xoopsTpl->assign('result', $ret);
}
// Call Footer
xoops_cp_footer();
@@ -454,7 +454,7 @@
$xoBreadCrumb->render();
if (!$module_handler->insert($module)) {
echo '<p>Could not update '.$module->getVar('name').'</p>';
- echo "<br /><a href='admin.php?fct=modulesadmin'>" . _AM_SYSTEM_MODULES_BTOMADMIN . "</a>";
+ echo "<br /><div class='center'><a href='admin.php?fct=modulesadmin'>" . _AM_SYSTEM_MODULES_BTOMADMIN . "</a></div>";
} else {
$newmid = $module->getVar('mid');
$msgs = array();
@@ -818,7 +818,7 @@
}
$msgs[] = sprintf(_AM_SYSTEM_MODULES_OKUPD, '<strong>' . $module->getVar('name', 's') . '</strong>');
$msgs[] = '</div></div>';
- $msgs[] = '<a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a>';
+ $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
foreach ($msgs as $msg) {
echo $msg.'<br />';
}
@@ -828,6 +828,11 @@
// Flush cache files for cpanel GUIs
xoops_load("cpanel", "system");
XoopsSystemCpanel::flush();
+
+ require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
+ $maintenance = new SystemMaintenance();
+ $folder = array(1,3);
+ $maintenance->CleanCache($folder);
//Set active modules in cache folder
xoops_setActiveModules();
break;
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -392,10 +392,23 @@
}
}
}
- $msgs[] = sprintf( _AM_SYSTEM_MODULES_OKINS, '<strong>' . $module->getVar('name', 's') . '</strong>');
+
+ $msgs[] = sprintf(_AM_SYSTEM_MODULES_OKINS, '<strong>' . $module->getVar('name', 's') . '</strong>');
$msgs[] = '</div></div>';
- $msgs[] = '<a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a>';
+
+ $blocks = $module->getInfo('blocks');
+ $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a> |
+ <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_TOINSTALL . '</a> | ';
+ $msgs[] = '<br /><span class="red bold">' . _AM_SYSTEM_MODULES_MODULE . ' ' . $module->getInfo('name') . ': </span></div>';
+ if ($blocks != false) {
+ $msgs[] = '<div class="center"><a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a></div>';
+ }
+ ;
+ $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a>';
+ $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a></div>';
+
$ret = implode('<br />', $msgs);
+ unset($blocks);
unset($msgs);
unset($errs);
unset($module);
@@ -609,7 +622,7 @@
$msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_OKUNINS, "<strong>" . $module->getVar('name') . "</strong>") . '</p>';
}
$msgs[] = '</div></div>';
- $msgs[] = '<a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a>';
+ $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
$ret = implode("<br />", $msgs);
return $ret;
}
@@ -639,7 +652,7 @@
$msgs[] = '<p>' . sprintf( _AM_SYSTEM_MODULES_OKACT, '<strong>' . $module->getVar('name', 's') . '</strong>') . '</p></div>';
}
//$msgs[] = '</div>';
- $msgs[] = '<a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a>';
+ $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
$ret = implode('<br />', $msgs);
return $ret;
}
@@ -674,7 +687,7 @@
$msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_OKDEACT, '<strong>' . $module->getVar('name') . '</strong>') . '</p>';
}
}
- $msgs[] = '<a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a>';
+ $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
$ret = implode('<br />', $msgs);
return $ret;
}
Modified: XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -58,8 +58,7 @@
$modules = new XoopsFormSelect(_AM_SYSTEM_TEMPLATES_SELECT_MODULES, 'select_modules');
$module_handler =& xoops_gethandler('module');
- $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
- $criteria->add(new Criteria('isactive', 1));
+ $criteria = new CriteriaCompo(new Criteria('isactive', 1));
$moduleslist = $module_handler->getList($criteria, true);
$modules->addOption(0, _AM_SYSTEM_TEMPLATES_ALL_MODULES);
$modules->addOptionArray($moduleslist);
@@ -340,7 +339,7 @@
$tpltpl_handler =& xoops_gethandler('tplfile');
$templates_arr =& $tpltpl_handler->find('default', '', null, $_REQUEST['select_modules']);
- $modules = new XoopsFormSelect(_AM_SYSTEM_TEMPLATES_SELECT_MODULES, 'select_templates_modules', null, 10, true);
+ $modules = new XoopsFormSelect(_AM_SYSTEM_TEMPLATES_SELECT_TEMPLATES, 'select_templates_modules', null, 10, true);
foreach (array_keys($templates_arr) as $i)
{
$modules->addOption($templates_arr[$i]->getVar('tpl_file'));
Modified: XoopsCore/trunk/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/admin.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -91,7 +91,8 @@
// Define scripts
$xoTheme->addScript('browse.php?modules/system/js/admin.js');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink(_AM_SYSTEM_CONFIG);
+ $xoBreadCrumb->addLink( _AM_SYSTEM_CONFIG );
+ $xoBreadCrumb->addTips( _AM_SYSTEM_TIPS_MAIN );
$xoBreadCrumb->render();
$groups = $xoopsUser->getGroups();
$all_ok = false;
@@ -120,6 +121,7 @@
$menu['file'] = $directory;
$menu['title'] = trim($modversion['name']);
$menu['desc'] = str_replace('<br />', ' ', $modversion['description']);
+ $menu['icon'] = $modversion['image'];
$menu['status'] = true;
}
} else {
@@ -128,6 +130,7 @@
$menu['file'] = $directory;
$menu['title'] = trim($modversion['name']);
$menu['desc'] = str_replace('<br />', ' ', $modversion['description']);
+ $menu['icon'] = $modversion['image'];
$menu['status'] = false;
}
}
@@ -140,6 +143,41 @@
$avatar = $avatar_handler->getCount();
$menu['infos'] = sprintf(_AM_SYSTEM_AVATAR_INFO, $avatar);
break;
+ case 'banners':
+ $banner_handler =& xoops_getModuleHandler( 'banner', 'system' );
+ $banner = $banner_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_BANNER_INFO, $banner);
+ break;
+ case 'comments':
+ $comment_handler =& xoops_gethandler('comment');
+ $comment = $comment_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_COMMENT_INFO, $comment);
+ break;
+ case 'groups':
+ $groups_Handler =& xoops_getModuleHandler( 'group', 'system' );
+ $groups = $groups_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_GROUP_INFO, $groups);
+ break;
+ case 'images':
+ $imgcat_handler = xoops_gethandler('imagecategory');
+ $img = $imgcat_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_IMG_INFO, $img);
+ break;
+ case 'smilies':
+ $smilies_Handler =& xoops_getModuleHandler( 'smilies', 'system' );
+ $smilies = $smilies_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_SMILIES_INFO, $smilies);
+ break;
+ case 'userrank':
+ $userrank_Handler =& xoops_getModuleHandler( 'userrank', 'system' );
+ $userrank = $userrank_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_RANKS_INFO, $userrank);
+ break;
+ case 'users':
+ $member_handler =& xoops_getModuleHandler('users', 'system');
+ $member = $member_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_USERS_INFO, $member);
+ break;
}
$xoopsTpl->append_by_ref( 'menu', $menu );
unset( $menu );
Modified: XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -180,7 +180,9 @@
global $xoopsUser;
$xoopsDB =& Database::getInstance();
$module_handler =& xoops_gethandler('module');
- $block = array();
+ $block = array();
+
+ // waiting content for news
if ($module_handler->getCount(new Criteria('dirname', 'news'))) {
$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("stories")." WHERE published=0");
if ( $result ) {
@@ -188,7 +190,9 @@
list($block['modules'][0]['pendingnum']) = $xoopsDB->fetchRow($result);
$block['modules'][0]['lang_linkname'] = _MB_SYSTEM_SUBMS;
}
- }
+ }
+
+ // waiting content for mylinks
if ($module_handler->getCount(new Criteria('dirname', 'mylinks'))) {
$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_links")." WHERE status=0");
if ( $result ) {
@@ -208,7 +212,9 @@
list($block['modules'][3]['pendingnum']) = $xoopsDB->fetchRow($result);
$block['modules'][3]['lang_linkname'] = _MB_SYSTEM_MLNKS;
}
- }
+ }
+
+ // waiting content for mydownloads
if ($module_handler->getCount(new Criteria('dirname', 'mydownloads'))) {
$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE status=0");
if ( $result ) {
@@ -228,13 +234,46 @@
list($block['modules'][6]['pendingnum']) = $xoopsDB->fetchRow($result);
$block['modules'][6]['lang_linkname'] = _MB_SYSTEM_MFLS;
}
- }
- $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xoopscomments")." WHERE com_status=1");
+ }
+
+ // waiting content for xoops comments
+ $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xoopscomments")." WHERE com_status=1");
+ if ( $result ) {
+ $block['modules'][7]['adminlink'] = XOOPS_URL."/modules/system/admin.php?module=0&status=1&fct=comments";
+ list($block['modules'][7]['pendingnum']) = $xoopsDB->fetchRow($result);
+ $block['modules'][7]['lang_linkname'] =_MB_SYSTEM_COMPEND;
+ }
+
+ // waiting content for TDMDownloads
+ if ($module_handler->getCount(new Criteria('dirname', 'TDMDownloads'))) {
+ $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("tdmdownloads_downloads")." WHERE status=0");
if ( $result ) {
- $block['modules'][7]['adminlink'] = XOOPS_URL."/modules/system/admin.php?module=0&status=1&fct=comments";
- list($block['modules'][7]['pendingnum']) = $xoopsDB->fetchRow($result);
- $block['modules'][7]['lang_linkname'] =_MB_SYSTEM_COMPEND;
+ $block['modules'][8]['adminlink'] = XOOPS_URL."/modules/TDMDownloads/admin/downloads.php?op=list&statut_display=0";
+ list($block['modules'][8]['pendingnum']) = $xoopsDB->fetchRow($result);
+ $block['modules'][8]['lang_linkname'] = _MB_SYSTEM_TDMDOWNLOADS;
}
+ }
+
+ // waiting content for extgallery
+ if ($module_handler->getCount(new Criteria('dirname', 'extgallery'))) {
+ $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("extgallery_publicphoto")." WHERE photo_approved=0");
+ if ( $result ) {
+ $block['modules'][9]['adminlink'] = XOOPS_URL."/modules/extgallery/admin/photo.php#pending-photo";
+ list($block['modules'][9]['pendingnum']) = $xoopsDB->fetchRow($result);
+ $block['modules'][9]['lang_linkname'] = _MB_SYSTEM_EXTGALLERY;
+ }
+ }
+
+ // waiting content for smartsection
+ if ($module_handler->getCount(new Criteria('dirname', 'smartsection'))) {
+ $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("smartsection_items")." WHERE status=1");
+ if ( $result ) {
+ $block['modules'][10]['adminlink'] = XOOPS_URL."/modules/smartsection/admin/item.php";
+ list($block['modules'][10]['pendingnum']) = $xoopsDB->fetchRow($result);
+ $block['modules'][10]['lang_linkname'] = _MB_SYSTEM_SMARTSECTION;
+ }
+ }
+
return $block;
}
Modified: XoopsCore/trunk/htdocs/modules/system/class/group.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/group.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/class/group.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -144,12 +144,13 @@
ksort($blocks_module);
$r_block_tray = new XoopsFormElementTray(_AM_SYSTEM_GROUPS_BLOCKRIGHTS, "<br /><br />");
+ $s_checkbox_all = new XoopsFormCheckBox('', "blocksbox", 1);
+ $s_checkbox_all->addOption('allbox', _AM_SYSTEM_ALL );
+ $s_checkbox_all->setExtra(" onclick='xoopsCheckGroup(\"groupform\", \"blocksbox\" , \"read_bids[]\");' ");
+ $s_checkbox_all->setClass('xo-checkall');
+ $r_block_tray->addElement($s_checkbox_all);
foreach (array_keys($blocks_module) as $mid) {
- $s_checkbox_all = new XoopsFormCheckBox('', "blocksbox", 1);
- $s_checkbox_all->addOption('allbox', _AM_SYSTEM_ALL );
- $s_checkbox_all->setExtra(" onclick='xoopsCheckGroup(\"groupform\", \"blocksbox\" , \"read_bids[]\");' ");
- $s_checkbox_all->setClass('xo-checkall');
- $r_block_tray->addElement($s_checkbox_all);
+
$new_blocks_array = array();
foreach ($blocks_module[$mid] as $key => $value) {
$new_blocks_array[$key] = "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=edit&bid={$key}' title='ID: {$key}' rel='external'>{$value}</a>";
Modified: XoopsCore/trunk/htdocs/modules/system/class/users.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/users.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/class/users.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -16,7 +16,7 @@
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-include_once XOOPS_ROOT_PATH . '/kernel/users.php';
+include_once XOOPS_ROOT_PATH . '/kernel/user.php';
/**
* System Users
Modified: XoopsCore/trunk/htdocs/modules/system/images/icons/default/delete.png
===================================================================
(Binary files differ)
Modified: XoopsCore/trunk/htdocs/modules/system/images/icons/default/display.png
===================================================================
(Binary files differ)
Modified: XoopsCore/trunk/htdocs/modules/system/images/icons/default/edit.png
===================================================================
(Binary files differ)
Copied: XoopsCore/trunk/htdocs/modules/system/images/icons/default/print_printer.png (from rev 8544, XoopsCore/releases/2.5.0-rc/htdocs/modules/system/images/icons/default/print_printer.png)
===================================================================
(Binary files differ)
Modified: XoopsCore/trunk/htdocs/modules/system/js/admin.js
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/js/admin.js 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/js/admin.js 2011-12-25 22:52:19 UTC (rev 8545)
@@ -122,18 +122,16 @@
*/
function display_dialog(id, bgiframe, modal, hide, show, height, width) {
$(document).ready(function(){
- if (!$("#dialog"+id).dialog( 'isOpen' )) {
$("#dialog"+id).dialog({
bgiframe: bgiframe,
modal: modal,
- //hide: hide,
- //show: show,
+ hide: hide,
+ show: show,
height: height,
width: width,
autoOpen: false
});
$("#dialog"+id).dialog("open");
- }
});
}
function xo_toggle(object) {
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -19,8 +19,8 @@
define("_AM_SYSTEM_MAINTENANCE_CACHE_OK","Cache maintenance : OK");
define("_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK","Cache maintenance : Error");
define("_AM_SYSTEM_MAINTENANCE_TABLES","Tables maintenance");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_OK","Cache maintenance : OK");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_NOTOK","Cache maintenance : Error");
+define("_AM_SYSTEM_MAINTENANCE_TABLES_OK","Tables maintenance : OK");
+define("_AM_SYSTEM_MAINTENANCE_TABLES_NOTOK","Tables maintenance : Error");
define("_AM_SYSTEM_MAINTENANCE_QUERY_DESC","Optimize, Check, Repair and Analyze your tables");
define("_AM_SYSTEM_MAINTENANCE_QUERY_OK","Maintain database : OK");
define("_AM_SYSTEM_MAINTENANCE_QUERY_NOTOK","Maintain database : Error");
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin/modulesadmin.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin/modulesadmin.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -174,6 +174,7 @@
<li>If you install a new module, remember to setup module preferences, blocks and users permissions!</li>
<li>For hide module into Main Menu block, set order to 0</li>
<li>Delete unused module files from your server to avoid security issues and keep your website safe.</li>
+<li>To change order of modules (which will be reflected in the Menu), you just need to drag and drop the modules to the desired placement.</li>
</ul>');
define( '_AM_SYSTEM_MODULES_CONFIRM_TIPS',
'<ul>
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -23,7 +23,15 @@
define('_AM_SYSTEM_LOADING', 'Loading');
define('_AM_SYSTEM_ALL', 'All');
-define('_AM_SYSTEM_AVATAR_INFO', 'There is <span class="bold">%s</span> avatars.' );
+define('_AM_SYSTEM_TIPS_MAIN','<ul><li>Enable or disable sections of system module or just access to it.</li></ul>');
+define('_AM_SYSTEM_AVATAR_INFO', '<ul><li><span class="bold red">%s</span> avatars.</li></ul>' );
+define('_AM_SYSTEM_BANNER_INFO', '<ul><li><span class="bold red">%s</span> banners.</li></ul>' );
+define('_AM_SYSTEM_COMMENT_INFO', '<ul><li><span class="bold red">%s</span> comments.</li></ul>' );
+define('_AM_SYSTEM_GROUP_INFO', '<ul><li><span class="bold red">%s</span> groups.</li></ul>' );
+define('_AM_SYSTEM_IMG_INFO', '<ul><li><span class="bold red">%s</span> images.</li></ul>' );
+define('_AM_SYSTEM_SMILIES_INFO', '<ul><li><span class="bold red">%s</span> smilies.</li></ul>' );
+define('_AM_SYSTEM_RANKS_INFO', '<ul><li><span class="bold red">%s</span> user ranks.</li></ul>' );
+define('_AM_SYSTEM_USERS_INFO', '<ul><li><span class="bold red">%s</span> users.</li></ul>' );
// Admin Module Names and description
define( '_AM_SYSTEM_ADGS', 'Groups');
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/blocks.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/blocks.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/blocks.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -22,7 +22,10 @@
define("_MB_SYSTEM_MLNKS","Modified Links");
define("_MB_SYSTEM_WDLS","Waiting Downloads");
define("_MB_SYSTEM_BFLS","Broken Files");
-define("_MB_SYSTEM_MFLS","Modified Downloads");
+define("_MB_SYSTEM_MFLS","Modified Downloads");
+define("_MB_SYSTEM_TDMDOWNLOADS","Waiting Downloads");
+define("_MB_SYSTEM_EXTGALLERY","Waiting Photos");
+define("_MB_SYSTEM_SMARTSECTION","Articles");
define("_MB_SYSTEM_HOME","Home"); // link to home page in main menu block
define("_MB_SYSTEM_RECO","Recommend Us");
define("_MB_SYSTEM_PWWIDTH","Pop-Up Window Width");
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/cpanel.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/cpanel.php 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/cpanel.php 2011-12-25 22:52:19 UTC (rev 8545)
@@ -4,6 +4,8 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
+define("_MD_AM_VRSN", "Version");
+define("_MD_AM_FINDUSER", "Find Users");
define("_MD_CPANEL_NEWS", "News");
define("_MD_CPANEL_NEWS_DESC", "XOOPS development news");
define("_MD_CPANEL_PROJECT", "Project");
@@ -19,8 +21,8 @@
define("_MD_CPANEL_QUICKLINKS", "Quick links");
-define("_MD_CPANEL_SITE_ADMINISTRATION", "%s administration");
-
-// for help page
-define("_MD_CPANEL_HELPCENTER", "Welcom to XOOPS help center");
+define("_MD_CPANEL_SITE_ADMINISTRATION", "%s administration");
+
+// for help page
+define("_MD_CPANEL_HELPCENTER", "Welcome to XOOPS Help Center");
?>
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_index.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_index.html 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_index.html 2011-12-25 22:52:19 UTC (rev 8545)
@@ -8,25 +8,27 @@
<tr>
<th class="txtcenter"><{$smarty.const._AM_SYSTEM_SECTION}></th>
<th class="txtcenter"><{$smarty.const._AM_SYSTEM_DESC}></th>
- <!--<th class="txtcenter"> </th>-->
<th class="txtcenter"> </th>
+ <th class="txtcenter"> </th>
</tr>
</thead>
<tbody>
<{foreach item=menu from=$menu}>
<tr class="<{cycle values='even,odd'}>">
- <td class="bold width10"><{$menu.title}></td>
+ <td class="bold width20">
+ <a class="tooltip" href="admin.php?fct=<{$menu.file}>" title="<{$smarty.const._AM_SYSTEM_GO}>: <{$menu.title}>">
+ <img class="xo-imgmini" src='<{$theme_icons}>/<{$menu.icon}>' alt="<{$menu.title}>" />
+ <{$menu.title}>
+ </a>
+ </td>
<td class=""><{$menu.desc}></td>
- <!--<td class=""><{$menu.infos}></td>-->
- <td class="xo-actions width5">
+ <td class=""><{$menu.infos}></td>
+ <td class="xo-actions width2">
<{if $menu.used}>
<img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
<img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
<{/if}>
- <a class="tooltip" href="admin.php?fct=<{$menu.file}>" title="<{$smarty.const._AM_SYSTEM_GO}>">
- <img src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_GO}>" />
- </a>
</td>
</tr>
<{/foreach}>
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules_confirm.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules_confirm.html 2011-12-25 22:36:21 UTC (rev 8544)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules_confirm.html 2011-12-25 22:52:19 UTC (rev 8545)
@@ -1,4 +1,5 @@
<{includeq file="db:system_header.html"}>
+<{if $modifs_mods}>
<form action="admin.php" method="post">
<table class="outer" cellspacing="1">
<thead>
@@ -57,4 +58,16 @@
</tr>
</tfoot>
</table>
-</form>
...
[truncated message content] |
