xoops-svn Mailing List for XOOPS Web Application System (Page 136)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10004
          http://xoops.svn.sourceforge.net/xoops/?rev=10004&view=rev
Author:   luciorota
Date:     2012-08-07 16:45:58 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
removed spaces in definitions
add new feature: redirect to previous page

Modified Paths:
--------------
    XoopsModules/xhttperror/trunk/xhttperror/admin/admin_footer.php
    XoopsModules/xhttperror/trunk/xhttperror/admin/errors.php
    XoopsModules/xhttperror/trunk/xhttperror/admin/reports.php
    XoopsModules/xhttperror/trunk/xhttperror/class/error.php
    XoopsModules/xhttperror/trunk/xhttperror/language/english/admin.php
    XoopsModules/xhttperror/trunk/xhttperror/language/english/help/help.html
    XoopsModules/xhttperror/trunk/xhttperror/language/english/main.php
    XoopsModules/xhttperror/trunk/xhttperror/language/english/modinfo.php
    XoopsModules/xhttperror/trunk/xhttperror/templates/xhttperror_index.html
    XoopsModules/xhttperror/trunk/xhttperror/xoops_version.php

Modified: XoopsModules/xhttperror/trunk/xhttperror/admin/admin_footer.php
===================================================================

--- XoopsModules/xhttperror/trunk/xhttperror/admin/admin_footer.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/admin/admin_footer.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -1,37 +1,42 @@
-<?php
-/**
- * ****************************************************************************
- *  - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
- * ****************************************************************************
- *  XHTTPERROR - MODULE FOR XOOPS
- *  Copyright (c) 2007 - 2012
- *  Rota Lucio ( http://luciorota.altervista.org/xoops/ )
- *
- *  You may not change or alter any portion of this comment or credits
- *  of supporting developers from this source code or any supporting
- *  source code which is considered copyrighted (c) material of the
- *  original comment or credit authors.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  ---------------------------------------------------------------------------
- *  @copyright  Rota Lucio ( http://luciorota.altervista.org/xoops/ )
- *  @license    GNU General Public License v3.0 
- *  @package    xhttperror
- *  @author     Rota Lucio ( luc...@gm... )
- *
- *  $Rev$:     Revision of last commit
- *  $Author$:  Author of last commit
- *  $Date$:    Date of last commit
- * ****************************************************************************
- */
-
-global $pathImageAdmin;
-echo "<div align='center'><a href='http://www.xoops.org' target='_blank'>
-         <img src='".$pathImageModule."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a></div>";
-echo "<div class='center small italic pad5'>
-          <strong>" . $xoopsModule->getVar('name') . "</strong> "._AM_XHTTPERR_MAINTAINEDBY."
-            <a href='IN PROGRESS' title='Visit IN PROGRESS' class='tooltip' rel='external'>IN PROGRESS</a></div>";
-xoops_cp_footer();  
+<?php
+/**
+ * ****************************************************************************
+ *  - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
+ * ****************************************************************************
+ *  XHTTPERROR - MODULE FOR XOOPS
+ *  Copyright (c) 2007 - 2012
+ *  Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ *
+ *  You may not change or alter any portion of this comment or credits
+ *  of supporting developers from this source code or any supporting
+ *  source code which is considered copyrighted (c) material of the
+ *  original comment or credit authors.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  ---------------------------------------------------------------------------
+ *  @copyright  Rota Lucio ( http://luciorota.altervista.org/xoops/ )
+ *  @license    GNU General Public License v3.0 
+ *  @package    xhttperror
+ *  @author     Rota Lucio ( luc...@gm... )
+ *
+ *  $Rev$:     Revision of last commit
+ *  $Author$:  Author of last commit
+ *  $Date$:    Date of last commit
+ * ****************************************************************************
+ */
+
+global $pathImageAdmin; 
+    
+echo "<div align=\"center\">";
+echo "<a href=\"http://www.xoops.org\" target=\"_blank\">";
+echo "<img src=" . $pathImageAdmin.'/xoopsmicrobutton.gif'.' '." alt='XOOPS' title='XOOPS'>";
+echo "</a>";
+echo "</div>";
+echo "<div class='center small italic pad5'>";
+echo "<strong>" . $xoopsModule->getVar("name") . "</strong> " . _AM_XHTTPERR_MAINTAINEDBY . " <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a>";
+echo "</div>";
+
+xoops_cp_footer();
\ No newline at end of file

Modified: XoopsModules/xhttperror/trunk/xhttperror/admin/errors.php
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/admin/errors.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/admin/errors.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -59,7 +59,7 @@
 
             $GLOBALS['xoopsTpl']->assign('errors', $errors);
             $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
-            $GLOBALS['xoopsTpl']->display("db:xhttperror_admin_errors_list.html");
+            $GLOBALS['xoopsTpl']->display('db:xhttperror_admin_errors_list.html');
         } else {
             echo _AM_XHTTPERR_ERROR_NOERRORS;
         }
@@ -120,6 +120,9 @@
         $error->setVar('error_showme', $_REQUEST['error_showme']);
         $error->setVar('error_redirect', $_REQUEST['error_redirect']);
         $error->setVar('error_redirect_time', (int)$_REQUEST['error_redirect_time']);
+        /* IN PROGRESS
+        $error->setVar('error_redirect_message', (int)$_REQUEST['error_redirect_message']);
+        */
         $error->setVar('error_redirect_uri', $_REQUEST['error_redirect_uri']);
 
         if ( $errorHandler->insert($error)  ) {

Modified: XoopsModules/xhttperror/trunk/xhttperror/admin/reports.php
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/admin/reports.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/admin/reports.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -55,7 +55,6 @@
             $criteria->setOrder('ASC');
             $criteria->setLimit($GLOBALS['xoopsModuleConfig']['reports_per_page']);
             $reports = $reportHandler->getObjects($criteria, true, false);
-            
             foreach ($reports as $key=>$report) {
                 $reports[$key]['report_user'] = XoopsUserUtility::getUnameFromId($report['report_uid'], false, true);
                 $reports[$key]['report_date'] = formatTimeStamp($report['report_date'], _DATESTRING);

Modified: XoopsModules/xhttperror/trunk/xhttperror/class/error.php
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/class/error.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/class/error.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -32,6 +32,10 @@
     die("XOOPS root path not defined");
 }
 
+define('XHTTPERR_REDIRECT_NO', 0);
+define('XHTTPERR_REDIRECT_URI', 1);
+define('XHTTPERR_REDIRECT_PREVIOUS', 2);
+
 class XhttperrorError extends XoopsObject
 { 
 
@@ -47,7 +51,7 @@
         $this->initVar('error_text_smiley', XOBJ_DTYPE_INT, true, false); // default: true
         $this->initVar('error_text_breaks', XOBJ_DTYPE_INT, false, false); // default: false
         $this->initVar("error_showme", XOBJ_DTYPE_INT, true, false); // default: true
-        $this->initVar("error_redirect", XOBJ_DTYPE_INT, false, false); // default: false
+        $this->initVar("error_redirect", XOBJ_DTYPE_INT, XHTTPERR_REDIRECT_NO, false); // default: XHTTPERR_REDIRECT_NO
         $this->initVar("error_redirect_time", XOBJ_DTYPE_INT, 3, false); // default: 3 seconds
         $this->initVar("error_redirect_message", XOBJ_DTYPE_TXTBOX, '', false); // IN PROGRESS
         $this->initVar("error_redirect_uri", XOBJ_DTYPE_URL, XOOPS_URL, false); // default XOOPS_URL
@@ -68,9 +72,10 @@
         $form->setExtra('enctype="multipart/form-data"');
 
         // Title
-            $title = new XoopsFormText(_AM_XHTTPERR_ERROR_TITLE, 'error_title', 40, 255, $this->getVar('error_title'));
-        $form->addElement($title, true);
-        unset($title);
+            $errorTitle = new XoopsFormText(_AM_XHTTPERR_ERROR_TITLE, 'error_title', 40, 255, $this->getVar('error_title'));
+            $errorTitle->setDescription(_AM_XHTTPERR_ERROR_TITLE_DESC);
+        $form->addElement($errorTitle, true);
+        unset($errorTitle);
         // Error number
         if ($this->isNew()) {
             $errorStatuscode = new XoopsFormText(_AM_XHTTPERR_ERROR_STATUSCODE, 'error_statuscode', 3, 3, $this->getVar('error_statuscode'));
@@ -80,8 +85,8 @@
         $form->addElement($errorStatuscode, true);
         unset($errorStatuscode);
         // Text
-        $editor_configs=array();
-        $editor_configs["name"] ="error_text";
+        $editor_configs = array();
+        $editor_configs["name"] = "error_text";
         $editor_configs["value"] = $this->getVar('error_text', 'e');
         $editor_configs["rows"] = 10;
         $editor_configs["cols"] = 50;
@@ -96,6 +101,7 @@
             $errorTextOptions->addElement(new XoopsFormRadioYN(_AM_XHTTPERR_ERROR_TEXT_HTML, 'error_text_html', $this->getVar('error_text_html'), _YES, _NO));
             $errorTextOptions->addElement(new XoopsFormRadioYN(_AM_XHTTPERR_ERROR_TEXT_SMILEY, 'error_text_smiley', $this->getVar('error_text_smiley'), _YES, _NO));
             $errorTextOptions->addElement(new XoopsFormRadioYN(_AM_XHTTPERR_ERROR_TEXT_BREAKS, 'error_text_breaks', $this->getVar('error_text_breaks'), _YES, _NO));
+            $errorTextOptions->setDescription(_AM_XHTTPERR_ERROR_TEXT_OPTIONS_DESC);
         $form->addElement($errorTextOptions);
         unset($errorTextOptions);
         // Showme
@@ -106,7 +112,11 @@
         
         $form->addElement(new XoopsFormLabel(_AM_XHTTPERR_ERROR_REDIRECT_OPTIONS, '', ''));
         // Redirect
-            $errorRedirect = new XoopsFormRadioYN(_AM_XHTTPERR_ERROR_REDIRECT, 'error_redirect', $this->getVar('error_redirect'), _YES, _NO);
+            $errorRedirect = new XoopsFormSelect (_AM_XHTTPERR_ERROR_REDIRECT, 'error_redirect', $this->getVar('error_redirect'), 1, false);
+            $errorRedirect->addOption (XHTTPERR_REDIRECT_NO, _AM_XHTTPERR_ERROR_REDIRECT_OPTION_NO);
+            $errorRedirect->addOption (XHTTPERR_REDIRECT_URI, _AM_XHTTPERR_ERROR_REDIRECT_OPTION_URI);
+            $errorRedirect->addOption (XHTTPERR_REDIRECT_PREVIOUS, _AM_XHTTPERR_ERROR_REDIRECT_OPTION_PREVIOUS);
+            //$errorRedirect = new XoopsFormRadioYN(, _YES, _NO);
             $errorRedirect->setDescription(_AM_XHTTPERR_ERROR_REDIRECT_DESC);
         $form->addElement($errorRedirect);
         unset($errorRedirect);
@@ -115,8 +125,13 @@
             $errorRedirectTime->setDescription(_AM_XHTTPERR_ERROR_REDIRECT_TIME_DESC);
         $form->addElement($errorRedirectTime);
         unset($errorRedirectTime);
+        /* IN PROGRESS
         // Redirect message
-        // IN PROGRESS
+            $errorRedirectMessage = new XoopsFormText(_AM_XHTTPERR_ERROR_REDIRECT_MESSAGE, 'error_redirect_message', 40, 255, $this->getVar('error_redirect_message'));
+            $errorRedirectMessage->setDescription(_AM_XHTTPERR_ERROR_REDIRECT_MESSAGE_DESC);
+        $form->addElement($errorRedirectMessage, true);
+        unset($errorRedirectMessage);
+        */
         // Redirect uri
             $errorRedirectUri = new XoopsFormText(_AM_XHTTPERR_ERROR_REDIRECT_URI, 'error_redirect_uri', 40, 255, $this->getVar('error_redirect_uri'));
             $errorRedirectUri->setDescription(_AM_XHTTPERR_ERROR_REDIRECT_URI_DESC);

Modified: XoopsModules/xhttperror/trunk/xhttperror/language/english/admin.php
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/language/english/admin.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/language/english/admin.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -1,89 +1,94 @@
 <?php
-define("_AM_XHTTPERR_ACTION", "Action");
-define("_AM_XHTTPERR_ACTION_TEST", "Test");
-define("_AM_XHTTPERR_ACTION_EDIT_DESC", "Click to edit");
-define("_AM_XHTTPERR_ACTION_DELETE_DESC", "Click to delete");
+define("_AM_XHTTPERR_ACTION","Action");
+define("_AM_XHTTPERR_ACTION_TEST","Test");
+define("_AM_XHTTPERR_ACTION_EDIT_DESC","Click to edit");
+define("_AM_XHTTPERR_ACTION_DELETE_DESC","Click to delete");
 
-define("_AM_XHTTPERR_DELETEDSUCCESS", "Deleted");
-define("_AM_XHTTPERR_NOTDELETED", "Not deleted");
-define("_AM_XHTTPERR_SAVEDSUCCESS", "Saved");
-define("_AM_XHTTPERR_NOTSAVED", "Not saved");
+define("_AM_XHTTPERR_DELETEDSUCCESS","Deleted");
+define("_AM_XHTTPERR_NOTDELETED","Not deleted");
+define("_AM_XHTTPERR_SAVEDSUCCESS","Saved");
+define("_AM_XHTTPERR_NOTSAVED","Not saved");
 
 
 
 // admin/index.php
-define("_AM_XHTTPERR_INTRO", "&nbsp;Info&nbsp;");
+define("_AM_XHTTPERR_INTRO","&nbsp;Info&nbsp;");
 
-define("_AM_XHTTPERR_INFO", "<p><strong>Please note:</strong> This module requires that the server supports .htaccess files (and that .htaccess files are allowed for your account), or some way for you to add custom error message redirects.</p>");
+define("_AM_XHTTPERR_INFO","<p><strong>Please note:</strong> This module requires that the server supports .htaccess files (and that .htaccess files are allowed for your account), or some way for you to add custom error message redirects.</p>");
 
-define("_AM_XHTTPERR_FILECHK", "Checking for the <b>.htaccess</b> file: ");
-define("_AM_XHTTPERR_FILEEXISTS", "<p style=\"color: green; font-weight: bold;\">OK</p>");
-define("_AM_XHTTPERR_FILENOEXIST", "<p style=\"color: red; font-weight: bold;\">the .htaccess does not exist - please add this file with the lines added below (please note the full stop at the start - this is part of the filename).</p>");
-define("_AM_XHTTPERR_ADDCODE", "<p>You will need to manually add the following lines to the <b>.htaccess</b> file in your XOOPS root directory for the error codes to work.</p>");
-define("_AM_XHTTPERR_NOCODE", "<p style=\"color: red; font-weight: bold;\">There are currently no error codes defined.</p>");
+define("_AM_XHTTPERR_FILECHK","Checking for the <b>.htaccess</b> file: ");
+define("_AM_XHTTPERR_FILEEXISTS","<p style=\"color: green; font-weight: bold;\">OK</p>");
+define("_AM_XHTTPERR_FILENOEXIST","<p style=\"color: red; font-weight: bold;\">the .htaccess does not exist - please add this file with the lines added below (please note the full stop at the start - this is part of the filename).</p>");
+define("_AM_XHTTPERR_ADDCODE","<p>You will need to manually add the following lines to the <b>.htaccess</b> file in your XOOPS root directory for the error codes to work.</p>");
+define("_AM_XHTTPERR_NOCODE","<p style=\"color: red; font-weight: bold;\">There are currently no error codes defined.</p>");
 
 
 
 // admin/errors.php
 // class/error.php
-define("_AM_XHTTPERR_ERROR_ADD", "Create error code");
-define("_AM_XHTTPERR_ERROR_EDIT", "Edit error code");
-define("_AM_XHTTPERR_ERROR_LIST", "List error codes");
-define("_AM_XHTTPERR_ERROR_CODES", "Error codes");
-define("_AM_XHTTPERR_ERROR_CODE", "Error code");
+define("_AM_XHTTPERR_ERROR_ADD","Create error code");
+define("_AM_XHTTPERR_ERROR_EDIT","Edit error code");
+define("_AM_XHTTPERR_ERROR_LIST","List error codes");
+define("_AM_XHTTPERR_ERROR_CODES","Error codes");
+define("_AM_XHTTPERR_ERROR_CODE","Error code");
 
-define("_AM_XHTTPERR_ERROR_NOERRORS", "No error types defined");
+define("_AM_XHTTPERR_ERROR_NOERRORS","No error types defined");
 
-define("_AM_XHTTPERR_ERRORS", "Error codes");
-define("_AM_XHTTPERR_ERROR_ID", "ID");
-define("_AM_XHTTPERR_ERROR_ID_DESC", "");
-define("_AM_XHTTPERR_ERROR_TITLE", "Title");
-define("_AM_XHTTPERR_ERROR_TITLE_DESC", "");
-define("_AM_XHTTPERR_ERROR_STATUSCODE", "Error status code");
-define("_AM_XHTTPERR_ERROR_STATUSCODE_DESC", "");
-define("_AM_XHTTPERR_ERROR_TEXT", "Message");
-define("_AM_XHTTPERR_ERROR_TEXT_DESC", "");
-define("_AM_XHTTPERR_ERROR_TEXT_OPTIONS", "Message options");
-define("_AM_XHTTPERR_ERROR_TEXT_HTML", "Html");
-define("_AM_XHTTPERR_ERROR_TEXT_SMILEY", "Smilies");
-define("_AM_XHTTPERR_ERROR_TEXT_BREAKS", "Line Feed");
-define("_AM_XHTTPERR_ERROR_STATUS", "Status");
-define("_AM_XHTTPERR_ERROR_STATUS_DESC", "Select Yes to display");
-define("_AM_XHTTPERR_ERROR_STATUS_SHOW", "Published");
-define("_AM_XHTTPERR_ERROR_STATUS_HIDE", "Hidden");
-define("_AM_XHTTPERR_ERROR_REDIRECT_OPTIONS", "Redirect options");
+define("_AM_XHTTPERR_ERRORS","Error codes");
+define("_AM_XHTTPERR_ERROR_ID","ID");
+define("_AM_XHTTPERR_ERROR_ID_DESC","");
+define("_AM_XHTTPERR_ERROR_TITLE","Title");
+define("_AM_XHTTPERR_ERROR_TITLE_DESC","");
+define("_AM_XHTTPERR_ERROR_STATUSCODE","Error status code");
+define("_AM_XHTTPERR_ERROR_STATUSCODE_DESC","");
+define("_AM_XHTTPERR_ERROR_TEXT","Message");
+define("_AM_XHTTPERR_ERROR_TEXT_DESC","");
+define("_AM_XHTTPERR_ERROR_TEXT_OPTIONS","Message options");
+define("_AM_XHTTPERR_ERROR_TEXT_OPTIONS_DESC","");
+define("_AM_XHTTPERR_ERROR_TEXT_HTML","Html");
+define("_AM_XHTTPERR_ERROR_TEXT_SMILEY","Smilies");
+define("_AM_XHTTPERR_ERROR_TEXT_BREAKS","Line Feed");
+define("_AM_XHTTPERR_ERROR_STATUS","Status");
+define("_AM_XHTTPERR_ERROR_STATUS_DESC","Select Yes to display");
+define("_AM_XHTTPERR_ERROR_STATUS_SHOW","Published");
+define("_AM_XHTTPERR_ERROR_STATUS_HIDE","Hidden");
+define("_AM_XHTTPERR_ERROR_REDIRECT_OPTIONS","Redirect options");
 define("_AM_XHTTPERR_ERROR_REDIRECT_OPTIONS_DESC", "");
-define("_AM_XHTTPERR_ERROR_REDIRECT", "Redirect");
-define("_AM_XHTTPERR_ERROR_REDIRECT_DESC", "Select Yes to redirect");
-define("_AM_XHTTPERR_ERROR_REDIRECT_TIME", "Redirect time");
-define("_AM_XHTTPERR_ERROR_REDIRECT_TIME_DESC", "Page will be redirected after n seconds");
-// Redirect message IN PROGRESS
-define("_AM_XHTTPERR_ERROR_REDIRECT_URI", "Redirect url");
-define("_AM_XHTTPERR_ERROR_REDIRECT_URI_DESC", "Page will be redirected to ...");
+define("_AM_XHTTPERR_ERROR_REDIRECT","Redirect");
+define("_AM_XHTTPERR_ERROR_REDIRECT_DESC","");
+define("_AM_XHTTPERR_ERROR_REDIRECT_OPTION_NO","No redirect");
+define("_AM_XHTTPERR_ERROR_REDIRECT_OPTION_URI","Redirect to url ...");
+define("_AM_XHTTPERR_ERROR_REDIRECT_OPTION_PREVIOUS","Redirect to previous page");
+define("_AM_XHTTPERR_ERROR_REDIRECT_TIME","Redirect time");
+define("_AM_XHTTPERR_ERROR_REDIRECT_TIME_DESC","Page will be redirected after ... seconds");
+//define("_AM_XHTTPERR_ERROR_REDIRECT_MESSAGE","Redirect message");
+//define("_AM_XHTTPERR_ERROR_REDIRECT_MESSAGE_DESC","");
+define("_AM_XHTTPERR_ERROR_REDIRECT_URI","Redirect url");
+define("_AM_XHTTPERR_ERROR_REDIRECT_URI_DESC","Page will be redirected to ...");
 
-define("_AM_XHTTPERR_ERROR_RUSUREDEL", "Are you sure to delete %s error?");
-define("_AM_XHTTPERR_STATUSCODE_EXISTS", "That error code already exists!");
+define("_AM_XHTTPERR_ERROR_RUSUREDEL","Are you sure to delete %s error?");
+define("_AM_XHTTPERR_STATUSCODE_EXISTS","That error code already exists!");
 
 
 
 // admin/reports.php
 // class/report.php
-define("_AM_XHTTPERR_REPORT_NOREPORTS", "There are no error reports");
+define("_AM_XHTTPERR_REPORT_NOREPORTS","There are no error reports");
 
-define("_AM_XHTTPERR_REPORTS", "Reports");
-define("_AM_XHTTPERR_REPORT_ID", "ID");
-define("_AM_XHTTPERR_REPORT_USER", "User");
-define("_AM_XHTTPERR_REPORT_STATUSCODE", "Error status code");
-define("_AM_XHTTPERR_REPORT_DATE", "Date");
-define("_AM_XHTTPERR_REPORT_REFERER", "Referer");
-define("_AM_XHTTPERR_REPORT_USERAGENT", "User agent");
-define("_AM_XHTTPERR_REPORT_REMOTEADDR", "User IP");
-define("_AM_XHTTPERR_REPORT_REQUESTEDURI", "Page requested");
+define("_AM_XHTTPERR_REPORTS","Reports");
+define("_AM_XHTTPERR_REPORT_ID","ID");
+define("_AM_XHTTPERR_REPORT_USER","User");
+define("_AM_XHTTPERR_REPORT_STATUSCODE","Error status code");
+define("_AM_XHTTPERR_REPORT_DATE","Date");
+define("_AM_XHTTPERR_REPORT_REFERER","Referer");
+define("_AM_XHTTPERR_REPORT_USERAGENT","User agent");
+define("_AM_XHTTPERR_REPORT_REMOTEADDR","User IP");
+define("_AM_XHTTPERR_REPORT_REQUESTEDURI","Page requested");
 
-define("_AM_XHTTPERR_REPORT_RUSUREDEL", "Are you sure to delete this report (ID=%s)?");
+define("_AM_XHTTPERR_REPORT_RUSUREDEL","Are you sure to delete this report (ID=%s)?");
 
 
 
 // Error NoFrameworks
 define("_AM_XHTTPERR_NOFRAMEWORKS","Error: You don&#39;t use the Frameworks \"admin module\". Please install this Frameworks");
-define("_AM_XHTTPERR_MAINTAINEDBY", "is maintained by the");
+define("_AM_XHTTPERR_MAINTAINEDBY","is maintained by the");

Modified: XoopsModules/xhttperror/trunk/xhttperror/language/english/help/help.html
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/language/english/help/help.html	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/language/english/help/help.html	2012-08-07 16:45:58 UTC (rev 10004)
@@ -14,7 +14,7 @@
     <br />
     ErrorDocument 403 [xoops_url]/modules/xhttperror/index.php?error=403
     <br />
-    ErrorDocument 403 [xoops_url]/modules/xhttperror/index.php?error=[status code here]
+    ErrorDocument 403 [xoops_url]/modules/xhttperror/index.php?error=[status code]
     </div>
     <p>Where [status_code] is the status code for server errors and [xoops_url] is the  URL to your main XOOPS directory WITHOUT trailing slash (<{$xoops_url}>)</p>
     <br />

Modified: XoopsModules/xhttperror/trunk/xhttperror/language/english/main.php
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/language/english/main.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/language/english/main.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -1,3 +1,3 @@
 <?php
 // index.php
-define("_MD_XHTTPERR_SEARCH",	"Search this site:");
+define("_MD_XHTTPERR_SEARCH","Search this site:");

Modified: XoopsModules/xhttperror/trunk/xhttperror/language/english/modinfo.php
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/language/english/modinfo.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/language/english/modinfo.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -1,30 +1,29 @@
 <?php
-define("_MI_XHTTPERR_NAME", "xHttpError");
-define("_MI_XHTTPERR_DESC", "A XOOPS module to manage http errors.");
+define("_MI_XHTTPERR_NAME","xHttpError");
+define("_MI_XHTTPERR_DESC","A XOOPS module to manage http errors.");
 
 // config options
-define("_MI_XHTTPERR_FORM_EDITOR",       "[Editor] Choose an editor for categories description");
-define("_MI_XHTTPERR_FORM_EDITOR_DESC",  "<ul><li><b>dhtmltextarea:</b> default Xoops editor</li><li><b>textarea:</b> standard html textarea</li><li><b>tinymce:</b> enhanced WYSIWYG editor</li><li>...</li></ul>");
-define("_MI_XHTTPERR_IGNOREADMIN",       "Ignore admins");
-define("_MI_XHTTPERR_IGNOREADMIN_DESC",  "Do not add error reports into the database for admins.");
-define("_MI_XHTTPERR_REPORTING",         "Turn off error reports");
-define("_MI_XHTTPERR_REPORTING_DESC",    "Busy sites may want to turn off error reporting if the report page gets too large.");
-define("_MI_XHTTPERR_PAGETTL",           "Page title");
-define("_MI_XHTTPERR_PAGETTLDSC",        "Put the error title in the page's title");
-define("_MI_XHTTPERR_PAGETTL1",          "None");
-define("_MI_XHTTPERR_PAGETTL2",          "Yes: &lt;module name&gt; - &lt;error&gt;");
-define("_MI_XHTTPERR_PAGETTL3",          "Yes: &lt;error&gt; - &lt;module name&gt;");
-define("_MI_XHTTPERR_NUMREPS",           "Number of reports");
-define("_MI_XHTTPERR_NUMREPS_DESC",      "The numbers of reports to show.");
+define("_MI_XHTTPERR_FORM_EDITOR","[Editor] Choose an editor for categories description");
+define("_MI_XHTTPERR_FORM_EDITOR_DESC","<ul><li><b>dhtmltextarea:</b> default Xoops editor</li><li><b>textarea:</b> standard html textarea</li><li><b>tinymce:</b> enhanced WYSIWYG editor</li><li>...</li></ul>");
+define("_MI_XHTTPERR_IGNOREADMIN","Ignore admins");
+define("_MI_XHTTPERR_IGNOREADMIN_DESC","Do not add error reports into the database for admins.");
+define("_MI_XHTTPERR_REPORTING","Turn off error reports");
+define("_MI_XHTTPERR_REPORTING_DESC","Busy sites may want to turn off error reporting if the report page gets too large.");
+define("_MI_XHTTPERR_PAGETTL","Page title");
+define("_MI_XHTTPERR_PAGETTLDSC","Put the error title in the page's title");
+define("_MI_XHTTPERR_PAGETTL1","None");
+define("_MI_XHTTPERR_PAGETTL2","Yes: &lt;module name&gt; - &lt;error&gt;");
+define("_MI_XHTTPERR_PAGETTL3","Yes: &lt;error&gt; - &lt;module name&gt;");
+define("_MI_XHTTPERR_NUMREPS","Number of reports");
+define("_MI_XHTTPERR_NUMREPS_DESC","The numbers of reports to show.");
 
 // Admin menu
 // admin/menu.php
-define("_MI_XHTTPERR_ADMENU_INDEX", "Index");
-define("_MI_XHTTPERR_ADMENU_INDEX_DESC", "");
-define("_MI_XHTTPERR_ADMENU_ERRORS", "Error codes");
-define("_MI_XHTTPERR_ADMENU_ERRORS_DESC", "");
-define("_MI_XHTTPERR_ADMENU_REPORTS", "Reports");
-define("_MI_XHTTPERR_ADMENU_REPORTS_DESC", "");
-define("_MI_XHTTPERR_ADMENU_ABOUT", "About");
-define("_MI_XHTTPERR_ADMENU_ABOUT_DESC", "");
-
+define("_MI_XHTTPERR_ADMENU_INDEX","Index");
+define("_MI_XHTTPERR_ADMENU_INDEX_DESC","");
+define("_MI_XHTTPERR_ADMENU_ERRORS","Error codes");
+define("_MI_XHTTPERR_ADMENU_ERRORS_DESC","");
+define("_MI_XHTTPERR_ADMENU_REPORTS","Reports");
+define("_MI_XHTTPERR_ADMENU_REPORTS_DESC","");
+define("_MI_XHTTPERR_ADMENU_ABOUT","About");
+define("_MI_XHTTPERR_ADMENU_ABOUT_DESC","");

Modified: XoopsModules/xhttperror/trunk/xhttperror/templates/xhttperror_index.html
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/templates/xhttperror_index.html	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/templates/xhttperror_index.html	2012-08-07 16:45:58 UTC (rev 10004)
@@ -3,18 +3,27 @@
 $title          text        Error title
 $text           text/html   Error description
 $showsearch     boolean     True if show search form in error page
-$redirect       boolean     True if redirect
+$redirect       int         $smarty.const.XHTTPERR_REDIRECT_no: no redirect; 
+                            $smarty.const.XHTTPERR_REDIRECT_URI: redirect tu url...; 
+                            $smarty.const.XHTTPERR_REDIRECT_PREVIOUS: redirect to previous page;
 $redirect_time  int         Milliseconds to redirect
 $redirect_uri   text        Redirect to 
 *}>
-<{if ($redirect)}>
+<{if ($redirect == $smarty.const.XHTTPERR_REDIRECT_URI)}>
 <script type="text/JavaScript">
     <!--
     setTimeout("location.href = '<{$redirect_uri}>';", <{$redirect_time}>);
-    //setTimeout("history.go(-1);", <{$redirect_time}>);
     -->
 </script>
 <{/if}>
+<{if ($redirect == $smarty.const.XHTTPERR_REDIRECT_PREVIOUS)}>
+<script type="text/JavaScript">
+    <!--
+    setTimeout("history.go(-1);", <{$redirect_time}>);
+    -->
+</script>
+<{/if}>
+
 <h1 style="text-align: center;"><{$title}></h1>
 
 <{$text}>

Modified: XoopsModules/xhttperror/trunk/xhttperror/xoops_version.php
===================================================================
--- XoopsModules/xhttperror/trunk/xhttperror/xoops_version.php	2012-08-07 16:26:27 UTC (rev 10003)
+++ XoopsModules/xhttperror/trunk/xhttperror/xoops_version.php	2012-08-07 16:45:58 UTC (rev 10004)
@@ -47,7 +47,7 @@
 
 $modversion['release_info'] = 'in progress';
 $modversion['release_file'] = XOOPS_URL . "/modules/{$dirname}/docs/RC";
-$modversion['release_date'] = '2012/08/06'; // 'Y/m/d'
+$modversion['release_date'] = '2012/08/08'; // 'Y/m/d'
 
 $modversion['min_php'] = '5.2';
 $modversion['min_xoops'] = '2.5.5';
@@ -71,7 +71,7 @@
 $modversion['support_site_url']	= '';
 $modversion['support_site_name'] = '';
 $modversion['release'] = "release";
-$modversion['module_status'] = 'beta'; //"Stable";
+$modversion['module_status'] = 'rc'; //"Stable";
 
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2012	Jan	Feb (214)	Mar (139)	Apr (198)	May (187)	Jun (151)	Jul (210)	Aug (169)	Sep (58)	Oct (53)	Nov (54)	Dec (301)
2013	Jan (348)	Feb (178)	Mar (219)	Apr (154)	May (117)	Jun (194)	Jul (61)	Aug (132)	Sep (121)	Oct (110)	Nov (11)	Dec (18)
2014	Jan (34)	Feb (50)	Mar (82)	Apr (98)	May (39)	Jun (111)	Jul (67)	Aug (36)	Sep (33)	Oct (26)	Nov (53)	Dec (44)
2015	Jan (29)	Feb (47)	Mar (25)	Apr (19)	May (23)	Jun (20)	Jul (49)	Aug (7)	Sep (10)	Oct (10)	Nov (4)	Dec (25)
2016	Jan (8)	Feb (7)	Mar (1)	Apr	May (3)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (7)	Dec (5)
2017	Jan (4)	Feb	Mar	Apr	May (15)	Jun	Jul (18)	Aug (24)	Sep	Oct (14)	Nov	Dec
2018	Jan	Feb (22)	Mar	Apr (11)	May (1)	Jun (17)	Jul (2)	Aug (2)	Sep	Oct (6)	Nov (5)	Dec
2019	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2025	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec

xoops-svn Mailing List for XOOPS Web Application System (Page 136)

The world's leading content management systems (CMS) written in PHP

xoops-svn — All SVN commits will be posted to this ML