[xoops-svn] SF.net SVN: xoops-svn:[10850] XoopsCore/branches/2.6.x/2.6.0

[<ma...@us...>]

Revision: 10850
          http://sourceforge.net/p/xoops/svn/10850
Author:   mageg
Date:     2013-01-19 21:30:30 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
change $xoops->result() 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/include/comment_delete.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.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/system/admin/tplsets/jquery.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:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php	2013-01-19 21:30:30 UTC (rev 10850)
@@ -322,9 +322,9 @@
             case 'zip':
                 $archive = new PclZip($path_file);
                 if ($archive->extract(PCLZIP_OPT_PATH, $path) == 0) {
-                    xoops_error(_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
+                    $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
                 } else {
-                    xoops_result(_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE);
+                    $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->error(_AM_SYSTEM_FILEMANAGER_ERROR);
+            $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_ERROR);
         } else {
-            $xoops->result(_AM_SYSTEM_FILEMANAGER_DELETE_FILE);
+            $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELETE_FILE);
         }
         break;
 
@@ -417,9 +417,9 @@
         }
 
         if (deltree($_REQUEST['path'])) {
-            $xoops->result(_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
+            $xoops->alert('info',_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
         } else {
-            $xoops->error(_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
+            $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
         }
         break;
 

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:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php	2013-01-19 21:30:30 UTC (rev 10850)
@@ -247,7 +247,7 @@
             }
         }
         $xoops->header();
-        $xoops->result($msgs);
+        $xoops->alert('info',$msgs);
         echo '<br /><a href="' . $redirect_page . '=' . $com_itemid . '&amp;com_order=' . $com_order . '&amp;com_mode=' . $com_mode . '">' . _BACK . '</a>';
         $xoops->footer();
         break;

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:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php	2013-01-19 21:30:30 UTC (rev 10850)
@@ -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->result($msg, $title);
+    $xoops->alert('info', $msg, $title);
 }
 
 /**

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:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php	2013-01-19 21:30:30 UTC (rev 10850)
@@ -887,7 +887,7 @@
                     $plugin->update($itemid, $comment_count);
 
                     $xoops->header();
-                    $xoops->result($msgs);
+                    $xoops->alert('info', $msgs);
                     echo '<br /><a href="' . $redirect_page . '=' . $itemid . '&amp;com_order=' . $order . '&amp;com_mode=' . $mode . '">' . _BACK . '</a>';
                     $xoops->footer();
                     break;

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:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php	2013-01-19 21:30:30 UTC (rev 10850)
@@ -138,7 +138,7 @@
         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->result(_AM_SYSTEM_TEMPLATES_RESTORE_OK);
+                    $xoops->alert('info', _AM_SYSTEM_TEMPLATES_RESTORE_OK);
                     exit();
                 }
             }