Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10851] XoopsCore/branches/2.6.x/2.6.0
|
From: <ma...@us...> - 2013-01-19 21:53:08
|
Revision: 10851
http://sourceforge.net/p/xoops/svn/10851
Author: mageg
Date: 2013-01-19 21:53:02 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
change $xoops->error() to $xoops->alert()
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -322,9 +322,9 @@
case 'zip':
$archive = new PclZip($path_file);
if ($archive->extract(PCLZIP_OPT_PATH, $path) == 0) {
- $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
+ echo $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
} else {
- $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_EXTRACT_FILE);
+ echo $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_EXTRACT_FILE);
}
break;
case 'tar':
@@ -344,9 +344,9 @@
case 'filemanager_delete_file':
$file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
if (!$file->delete()) {
- $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_ERROR);
+ echo $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_ERROR);
} else {
- $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELETE_FILE);
+ echo $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELETE_FILE);
}
break;
@@ -417,9 +417,9 @@
}
if (deltree($_REQUEST['path'])) {
- $xoops->alert('info',_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
+ echo $xoops->alert('info',_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
} else {
- $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
+ echo $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -134,7 +134,7 @@
}
$xoops->redirect('xoops_images.php?imgcat_id=' . $imgcat_id, 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
$xoopsTpl->display('module:images|images_tinymce.html');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -104,7 +104,7 @@
$comment = $comment_handler->get($com_id);
if (!$comment_handler->delete($comment)) {
$xoops->header();
- $xoops->error(_CM_COMDELETENG . ' (ID: ' . $comment->getVar('com_id') . ')');
+ echo $xoops->alert('error', _CM_COMDELETENG . ' (ID: ' . $comment->getVar('com_id') . ')');
$xoops->footer();
}
@@ -178,7 +178,7 @@
}
if (count($errs) > 0) {
$xoops->header();
- $xoops->error($errs);
+ echo $xoops->alert('error', $errs);
$xoops->footer();
exit();
}
@@ -247,7 +247,7 @@
}
}
$xoops->header();
- $xoops->alert('info',$msgs);
+ echo $xoops->alert('info',$msgs);
echo '<br /><a href="' . $redirect_page . '=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '">' . _BACK . '</a>';
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -127,7 +127,7 @@
if ($xoops->module->getVar('dirname') != 'system') {
$xoops->header();
if (!empty($captcha_message)) {
- $xoops->error($captcha_message);
+ echo $xoops->alert('error', $captcha_message);
}
echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
<tr><td class="head">' . $com_title . '</td></tr>
@@ -293,7 +293,7 @@
if (!$comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
$comment_handler->delete($comment);
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
}
}
@@ -406,7 +406,7 @@
} else {
if (!isset($purge_comment_post_results)) {
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
} else {
$comment_post_results = $comment->getErrors();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -31,7 +31,7 @@
$denied = false;
}
if ($denied) {
- $xoops->error(_NOPERM);
+ echo $xoops->alert('error', _NOPERM);
exit();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -142,7 +142,7 @@
{
$xoops = Xoops::getInstance();
$xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
- $xoops->error($msg, $title);
+ echo $xoops->alert('error', $msg, $title);
}
/**
@@ -155,7 +155,7 @@
{
$xoops = Xoops::getInstance();
$xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
- $xoops->alert('info', $msg, $title);
+ echo $xoops->alert('info', $msg, $title);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -133,7 +133,7 @@
if ($avatar_Handler->insert($obj)) {
$xoops->redirect('avatar_custom.php', 2, _AM_AVATARS_SAVE);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'avatar');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -159,7 +159,7 @@
$xoops->db()->query("UPDATE " . $xoops->db()->prefix('users') . " SET user_avatar='blank.gif' WHERE user_avatar='" . $file . "'");
$xoops->redirect("avatar_custom.php", 2, _AM_AVATARS_SAVE);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
if ($avatar_id > 0) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -141,7 +141,7 @@
if ($avatar_Handler->insert($obj)) {
$xoops->redirect('avatar_system.php', 2, _AM_AVATARS_SAVE);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'avatar');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -168,7 +168,7 @@
$xoops->db()->query("UPDATE " . $xoops->db()->prefix('users') . " SET user_avatar='blank.gif' WHERE user_avatar='" . $file . "'");
$xoops->redirect("avatar_system.php", 2, _AM_AVATARS_SAVE);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
if ($avatar_id > 0) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package banners
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -56,7 +56,7 @@
$admin_page->addItemButton(_AM_BANNERS_BANNERS_ADD, 'banners.php?op=new', 'add');
$admin_page->renderTips();
if ($client_Handler->getCount() == 0){
- $xoops->error(_AM_BANNERS_BANNERS_ERROR_NOCLIENT);
+ echo $xoops->alert('error', _AM_BANNERS_BANNERS_ERROR_NOCLIENT);
} else {
$admin_page->renderButton();
}
@@ -257,7 +257,7 @@
if ($banner_Handler->insert($obj)) {
$xoops->redirect("banners.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'banner');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -283,7 +283,7 @@
}
$xoops->redirect("banners.php", 2, _AM_BANNERS_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
@@ -322,7 +322,7 @@
if ($banner_Handler->insert($obj)) {
$xoops->redirect("banners.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package banners
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -150,7 +150,7 @@
if ($client_Handler->insert($obj)) {
$xoops->redirect("clients.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'bannerclient');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -180,12 +180,12 @@
unlink($urlfile);
}
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
$xoops->redirect("clients.php", 2, _AM_BANNERS_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package banners
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
@@ -314,7 +314,7 @@
if ($banner_Handler->insert($obj)) {
$xoops->redirect("index.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
} else {
$xoops->redirect(XOOPS_URL, 1, _MD_BANNERS_INDEX_NO_ID);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -258,7 +258,7 @@
$xoops->header();
if (!$xoops->isAdminSide && !empty($captcha_message)) {
- $xoops->error($captcha_message);
+ echo $xoops->alert('error', $captcha_message);
}
echo $this->renderHeader($comment->getVar('title', 'p'), $comment->getVar('text', 'p'), false, time());
$this->displayCommentForm($comment);
@@ -393,7 +393,7 @@
if (!$comment_handler->updateByField($comment, 'rootid', $comment->getVar('rootid'))) {
$comment_handler->delete($comment);
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
}
}
@@ -450,7 +450,7 @@
} else {
if (!isset($purge_comment_post_results)) {
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
} else {
$comment_post_results = $comment->getErrors();
@@ -781,7 +781,7 @@
case 'delete_one':
if (!$comment_handler->delete($comment)) {
$xoops->header();
- $xoops->error(_MD_COMMENTS_COMDELETENG . ' (ID: ' . $comment->getVar('id') . ')');
+ echo $xoops->alert('error', _MD_COMMENTS_COMDELETENG . ' (ID: ' . $comment->getVar('id') . ')');
$xoops->footer();
}
@@ -837,7 +837,7 @@
}
if (count($errs) > 0) {
$xoops->header();
- $xoops->error($errs);
+ echo $xoops->alert('error', $errs);
$xoops->footer();
exit();
}
@@ -887,7 +887,7 @@
$plugin->update($itemid, $comment_count);
$xoops->header();
- $xoops->alert('info', $msgs);
+ echo $xoops->alert('info', $msgs);
echo '<br /><a href="' . $redirect_page . '=' . $itemid . '&com_order=' . $order . '&com_mode=' . $mode . '">' . _BACK . '</a>';
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -98,7 +98,7 @@
}
$xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
$form = $helper->getForm($obj, 'image');
$xoops->tpl()->assign('form', $form->render());
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -153,7 +153,7 @@
}
$xoops->redirect('imagemanager.php?target=' . $target . '&imgcat_id=' . $imgcat_id, 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
$xoopsTpl->assign('xsize', 800);
@@ -272,7 +272,7 @@
}
if (isset($err)) {
$xoops->simpleHeader(false);
- $xoops->error($err);
+ echo $xoops->alert('error', $err);
echo '</head><body><div style="text-align:center;"><input value="' . _BACK . '" type="button" onclick="javascript:history.go(-1);" /></div>';
$xoops->simpleFooter();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -119,7 +119,7 @@
$this_handler->update_weights($obj);
$xoops->redirect('admin_menu.php?op=list&menu_id=' . $obj->getVar('mid'), 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $helper->getForm($obj, 'menus_menu');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -135,7 +135,7 @@
if ($helper->getHandlerMenu()->delete($obj)) {
$xoops->redirect('admin_menu.php?menu_id=' . $menu_id, 2, _AM_MENUS_MSG_SUCCESS);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$xoops->confirm(array(
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -75,7 +75,7 @@
if ($helper->getHandlerMenus()->insert($obj)) {
$xoops->redirect('admin_menus.php', 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $helper->getForm($obj, 'menus_menus');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -94,7 +94,7 @@
$this_handler->deleteAll($criteria);
$xoops->redirect('admin_menus.php', 2, _AM_MENUS_MSG_SUCCESS);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$xoops->confirm(array(
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -219,7 +219,7 @@
}
$xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
$form = $xoops->getModuleForm($obj, 'page_content');
$xoops->tpl()->assign('form', $form->render());
@@ -268,7 +268,7 @@
}
$xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// deleting main and secondary
@@ -356,7 +356,7 @@
}
$xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -188,7 +188,7 @@
}
$xoops->redirect("related.php", 2, _AM_PAGE_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
$form = $xoops->getModuleForm($obj, 'page_related');
$xoops->tpl()->assign('form', $form->render());
@@ -213,7 +213,7 @@
$related_Handler->deleteAll($criteria);
$xoops->redirect("related.php", 2, _AM_PAGE_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$xoops->confirm(array("ok" => 1, "id" => $related_id, "op" => "delete"), 'related.php', sprintf(_AM_PAGE_SUREDEL, $obj->getvar('related_name') . '<br />'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -85,7 +85,7 @@
if ($category_Handler->insert($obj)) {
$xoops->redirect('category.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_CATEGORY));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'category');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -104,7 +104,7 @@
if ($category_Handler->delete($obj)) {
$xoops->redirect("category.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -284,7 +284,7 @@
$url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
$xoops->redirect($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'regstep');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -303,7 +303,7 @@
if ($field_handler->deleteFields($obj)) {
$xoops->redirect("field.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -85,7 +85,7 @@
if ($regstep_Handler->insert($obj)) {
$xoops->redirect('step.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_STEP));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'regstep');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -104,7 +104,7 @@
if ($regstep_Handler->deleteRegstep($obj)) {
$xoops->redirect("step.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -105,13 +105,13 @@
if ($_FILES[$xoops_upload_file[0]]['error'] === 0) {
$uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/smilies', $mimetypes, $upload_size, null, null);
- if ($uploader->fetchMedia($xoops_upload_file[0])) {
+ if ($uploader->fetchMedia($xoops_upload_file[0])) {
$uploader->setPrefix('smil');
- if (!$uploader->upload()) {
- $msg[] = $uploader->getErrors();
+ if (!$uploader->upload()) {
+ $msg[] = $uploader->getErrors();
$obj->setVar('smiley_url', 'blank.gif');
- } else {
- $obj->setVar('smiley_url', 'smilies/' . $uploader->getSavedFileName());
+ } else {
+ $obj->setVar('smiley_url', 'smilies/' . $uploader->getSavedFileName());
}
}
}
@@ -119,7 +119,7 @@
if ($helper->getHandlerSmilies()->insert($obj)) {
$xoops->redirect('smilies.php', 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $helper->getForm($obj, 'smilies');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -142,7 +142,7 @@
}
$xoops->redirect('smilies.php', 2, _AM_SMILIES_DELETED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$smilies_img = ($obj->getVar('smiley_url')) ? $obj->getVar('smiley_url') : 'blank.gif';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -325,7 +325,7 @@
if (!$newid = $block_handler->insertBlock($block)) {
$xoops->header();
- $xoops->error($block->getHtmlErrors());
+ echo $xoops->alert('error', $block->getHtmlErrors());
$xoops->footer();
exit();
}
@@ -342,7 +342,7 @@
$blockmodulelink->setVar('module_id', $mid);
if (!$blockmodulelink_handler->insert($blockmodulelink)) {
$xoops->header();
- $xoops->error($blockmodulelink->getHtmlErrors());
+ echo $xoops->alert('error', $blockmodulelink->getHtmlErrors());
$xoops->footer();
exit();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -171,7 +171,7 @@
}
if (!$member_handler->insertGroup($group)) {
$xoops->header();
- $xoops->error($group->getHtmlErrors());
+ echo $xoops->alert('error', $group->getHtmlErrors());
$xoops->footer();
} else {
$groupid = $group->getVar('groupid');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -138,12 +138,12 @@
if ($valid_dir && in_array($extension_verif, $extensions) && XoopsLoad::fileExists($old_file) && XoopsLoad::fileExists($new_file)) {
if (unlink($new_file)) {
if (rename($old_file, $new_file)) {
- $xoops->alert('info', _AM_SYSTEM_TEMPLATES_RESTORE_OK);
+ echo $xoops->alert('info', _AM_SYSTEM_TEMPLATES_RESTORE_OK);
exit();
}
}
}
- $xoops->error(_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
+ echo $xoops->alert('error', _AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
break;
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -103,9 +103,9 @@
$groups = $user->getGroups();
if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
- $xoops->error(sprintf(_AM_SYSTEM_USERS_NO_ADMINSUPP, $user->getVar("uname")));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_NO_ADMINSUPP, $user->getVar("uname")));
} elseif (!$member_handler->deleteUser($user)) {
- $xoops->error(sprintf(_AM_SYSTEM_USERS_NO_SUPP, $user->getVar("uname")));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_NO_SUPP, $user->getVar("uname")));
} else {
$xoops->getHandlerOnline()->destroy($uid);
// RMV-NOTIFY
@@ -169,11 +169,11 @@
$edituser = $member_handler->getUser($uid);
if ($edituser->getVar('uname', 'n') != $_REQUEST['username'] && $member_handler->getUserCount(new Criteria('uname', $myts->addSlashes($_REQUEST['username']))) > 0) {
$xoops->header();
- $xoops->error(sprintf(_AM_SYSTEM_USERS_PSEUDO_ERROR, htmlspecialchars($_REQUEST['username'])));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_PSEUDO_ERROR, htmlspecialchars($_REQUEST['username'])));
$xoops->footer();
} elseif ($edituser->getVar('email', 'n') != $_REQUEST['email'] && $member_handler->getUserCount(new Criteria('email', $myts->addSlashes($_REQUEST['email']))) > 0) {
$xoops->header();
- $xoops->error(sprintf(_AM_SYSTEM_USERS_MAIL_ERROR, htmlspecialchars($_REQUEST['email'])));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_MAIL_ERROR, htmlspecialchars($_REQUEST['email'])));
$xoops->footer();
} else {
$edituser->setVar("name", $_REQUEST['name']);
@@ -310,7 +310,7 @@
}
}
}
- $xoops->error($adduser_errormsg);
+ echo $xoops->alert('error', $adduser_errormsg);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -30,7 +30,7 @@
$obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_WEBMASTERD));
$obj->setVar("group_type", 'Admin');
if (!$group_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create registered users group
$obj = $group_handler->create();
@@ -38,7 +38,7 @@
$obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_REGUSERSD));
$obj->setVar("group_type", 'User');
if (!$group_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create anonymous users group
$obj = $group_handler->create();
@@ -46,7 +46,7 @@
$obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_ANONUSERSD));
$obj->setVar("group_type", 'Anonymous');
if (!$group_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// data for table 'groups_users_link'
@@ -59,7 +59,7 @@
$obj->setVar("gperm_modid", '1');
$obj->setVar("gperm_name", 'module_read');
if (!$groupperm_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
for ($i = 1; $i <= 17; $i++) {
@@ -69,7 +69,7 @@
$obj->setVar("gperm_modid", '1');
$obj->setVar("gperm_name", 'module_read');
if (!$groupperm_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
// Make system block visible
@@ -98,7 +98,7 @@
$obj->setVar("gperm_modid", '1');
$obj->setVar("gperm_name", 'block_read');
if (!$groupperm_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
}
@@ -111,7 +111,7 @@
$obj->setVar("tplset_credits", '');
$obj->setVar("tplset_created", time());
if (!$tplset_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// user admin
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -166,7 +166,7 @@
}
$xoops->redirect("userrank.php", 2, _AM_USERRANK_SAVE);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$rank_img = ($obj->getVar("rank_image")) ? $obj->getVar("rank_image") : 'blank.gif';
|
