[xoops-svn] SF.net SVN: xoops-svn:[12437] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter

[<luc...@us...>]

Revision: 12437
          http://sourceforge.net/p/xoops/svn/12437
Author:   luciorota
Date:     2014-04-08 21:31:01 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
use defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
change $i++; to ++$i;

Modified Paths:
--------------
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/functions.php
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
    XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php	2014-04-08 21:29:30 UTC (rev 12436)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php	2014-04-08 21:31:01 UTC (rev 12437)
@@ -26,9 +26,7 @@
  * ****************************************************************************
  */
 
-if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 
 // module information
 $moduleImageUrl = XNEWSLETTER_URL . "/images/xNewsletter.png";

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/functions.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/functions.php	2014-04-08 21:29:30 UTC (rev 12436)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/functions.php	2014-04-08 21:31:01 UTC (rev 12437)
@@ -25,9 +25,7 @@
  *  Version : 1 Mon 2012/11/05 14:31:32 :  Exp $
  * ****************************************************************************
  */
-if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 include_once dirname(__FILE__) . '/common.php';
 
 

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php	2014-04-08 21:29:30 UTC (rev 12436)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php	2014-04-08 21:31:01 UTC (rev 12437)
@@ -26,9 +26,7 @@
  * ****************************************************************************
  */
 
-if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 include_once dirname(__FILE__) . '/common.php';
 
 function xNewsletter_createTasks($op, $letter_id, $xn_send_in_packages, $xn_send_in_packages_time) {

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php	2014-04-08 21:29:30 UTC (rev 12436)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php	2014-04-08 21:31:01 UTC (rev 12437)
@@ -25,9 +25,7 @@
  *  Version : $Id $
  * ****************************************************************************
  */
-if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
-}
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 include_once dirname(__FILE__) . '/common.php';
 
 function xnewsletter_plugin_getinfo_xoopsuser() {

Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php	2014-04-08 21:29:30 UTC (rev 12436)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php	2014-04-08 21:31:01 UTC (rev 12437)
@@ -79,7 +79,7 @@
 $i                                     = 0;
 $modversion['helpsection'][$i]['name'] = "Overview";
 $modversion['helpsection'][$i]['link'] = "page=help";
-$i++;
+++$i;
 $modversion['helpsection'][$i]['name'] = "Install";
 $modversion['helpsection'][$i]['link'] = "page=help2";
 
@@ -131,10 +131,11 @@
 
 $subcount = 1;
 $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_SUBSCRIBE;
-$modversion['sub'][$subcount++]['url'] = "subscription.php?op=list_subscriptions";
-
+$modversion['sub'][$subcount]['url'] = "subscription.php?op=list_subscriptions";
+++$subcount;
 $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST;
-$modversion['sub'][$subcount++]['url'] = "index.php?op=list_letters";
+$modversion['sub'][$subcount]['url'] = "index.php?op=list_letters";
+++$subcount;
 
 $showEdit = false;
 $showCreate = false;
@@ -162,11 +163,13 @@
         }
         if ($showCreate == true) {
             $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_CREATE;
-            $modversion['sub'][$subcount++]['url'] = "letter.php?op=new_letter";
+            $modversion['sub'][$subcount]['url'] = "letter.php?op=new_letter";
+            ++$subcount;
         }
         if ($showList == true) {
             $modversion['sub'][$subcount]['name'] = _MI_XNEWSLETTER_LIST_SUBSCR;
-            $modversion['sub'][$subcount++]['url'] = "letter.php?op=list_subscrs";
+            $modversion['sub'][$subcount]['url'] = "letter.php?op=list_subscrs";
+            ++$subcount;
         }
     }
 }
@@ -175,45 +178,45 @@
 $i = 1;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_header.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_footer.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_index.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_index_list_letters.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_subscription.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_subscription_result.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_subscription_list_subscriptions.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_letter.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_print.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_letter_preview.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_letter_list_letters.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_letter_list_subscrs.html';
 $modversion['templates'][$i]['description'] = '';
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_protocol.html';
 $modversion['templates'][$i]['description'] = '';
 
 // Common templates
-$i++;
+++$i;
 $modversion['templates'][$i]['file']        = $modversion['dirname'] . '_common_breadcrumb.html';
 $modversion['templates'][$i]['description'] = '';
 
@@ -231,14 +234,14 @@
 $modversion['config'][$i]['default']        = "dhtmltextarea";
 $modversion['config'][$i]['options']        = XoopsLists::getEditorList();
 $modversion['config'][$i]['category']       = "global";
-$i++;
+++$i;
 $modversion['config'][$i]['name']           = "keywords";
 $modversion['config'][$i]['title']          = "_MI_XNEWSLETTER_KEYWORDS";
 $modversion['config'][$i]['description']    = "_MI_XNEWSLETTER_KEYWORDS_DESC";
 $modversion['config'][$i]['formtype']       = "textbox";
 $modversion['config'][$i]['valuetype']      = "text";
 $modversion['config'][$i]['default']        = "";
-$i++;
+++$i;
 //Uploads : size letter_attachment
 $modversion['config'][$i]['name']           = "xn_maxsize";
 $modversion['config'][$i]['title']          = "_MI_XNEWSLETTER_ATTACHMENT_MAXSIZE";
@@ -246,7 +249,7 @@
 $modversion['config'][$i]['formtype']       = "textbox";
 $modversion['config'][$i]['valuetype']      = "int";
 $modversion['config'][$i]['default']        = "10485760"; // 1MByte
-$i++;
+++$i;
 //Uploads : mimetypes letter_attachment 
 $modversion['config'][$i]['name']           = "xn_mimetypes";
 $modversion['config'][$i]['title']          = "_MI_XNEWSLETTER_ATTACHMENT_MIMETYPES";
@@ -284,7 +287,7 @@
     'rtf' => 'text/rtf'
     );
 
-$i++;
+++$i;
 //Uploads : path attachments
 $modversion["config"][$i]["name"] = "xn_attachment_path";
 $modversion["config"][$i]["title"] = "_MI_XNEWSLETTER_ATTACHMENT_PATH";
@@ -292,14 +295,14 @@
 $modversion["config"][$i]["formtype"] = "textbox";
 $modversion["config"][$i]["valuetype"] = "text";
 $modversion["config"][$i]["default"] = "/xNewsletter/attachments/";
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "adminperpage";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_ADMINPERPAGE";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_ADMINPERPAGE_DESC";
 $modversion['config'][$i]['formtype'] = "textbox";
 $modversion['config'][$i]['valuetype'] = "text";
 $modversion['config'][$i]['default'] = '15';
-$i++;
+++$i;
 $modversion['config'][$i] = array(
     'name'        => 'dateformat',
     'title'       => '_MI_XNEWSLETTER_DATEFORMAT',
@@ -308,70 +311,70 @@
     'valuetype'   => 'text',
     'default'     => _DATESTRING
 ); //'D, d-M-Y');
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "welcome_message";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_WELCOME_MESSAGE";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_WELCOME_MESSAGE_DESC";
 $modversion['config'][$i]['formtype'] = "textarea";
 $modversion['config'][$i]['valuetype'] = "text";
 $modversion['config'][$i]['default'] = _MI_XNEWSLETTER_WELCOME;
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "advertise";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_ADVERTISE";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_ADVERTISE_DESC";
 $modversion['config'][$i]['formtype'] = "textarea";
 $modversion['config'][$i]['valuetype'] = "text";
 $modversion['config'][$i]['default'] = "";
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "social_active";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_SOCIALACTIVE";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_SOCIALACTIVE_DESC";
 $modversion['config'][$i]['formtype'] = "yesno";
 $modversion['config'][$i]['valuetype'] = "int";
 $modversion['config'][$i]['default'] = 0; // false
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "social_code";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_SOCIALCODE";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_SOCIALCODE_DESC";
 $modversion['config'][$i]['formtype'] = "textarea";
 $modversion['config'][$i]['valuetype'] = "text";
 $modversion['config'][$i]['default'] = "";
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "xn_use_mailinglist";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_USE_MAILINGLIST";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_USE_MAILINGLIST_DESC";
 $modversion['config'][$i]['formtype'] = "yesno";
 $modversion['config'][$i]['valuetype'] = "int";
 $modversion['config'][$i]['default'] = 0; // false
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "xn_use_salutation";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_USE_SALUTATION";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_USE_SALUTATION_DESC";
 $modversion['config'][$i]['formtype'] = "yesno";
 $modversion['config'][$i]['valuetype'] = "int";
 $modversion['config'][$i]['default'] = 1; // true
-$i++; 
+++$i;
 $modversion['config'][$i]['name'] = "xn_groups_without_actkey";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_GROUPS_WITHOUT_ACTKEY";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_GROUPS_WITHOUT_ACTKEY_DESC";
 $modversion['config'][$i]['formtype'] = "group_multi";
 $modversion['config'][$i]['valuetype'] = "array"; 
 $modversion['config'][$i]['default'] = '1';
-$i++; 
+++$i;
 $modversion['config'][$i]['name'] = "xn_groups_change_other";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_GROUPS_CHANGE_OTHER";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_GROUPS_CHANGE_OTHER_DESC";
 $modversion['config'][$i]['formtype'] = "group_multi";
 $modversion['config'][$i]['valuetype'] = "array";
 $modversion['config'][$i]['default'] = '1';
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "xn_send_in_packages";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_SEND_IN_PACKAGES";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_SEND_IN_PACKAGES_DESC";
 $modversion['config'][$i]['formtype'] = "textbox";
 $modversion['config'][$i]['valuetype'] = "int";
 $modversion['config'][$i]['default'] = '0';
-$i++;
+++$i;
 $modversion['config'][$i]['name'] = "xn_send_in_packages_time";
 $modversion['config'][$i]['title'] = "_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME";
 $modversion['config'][$i]['description'] = "_MI_XNEWSLETTER_SEND_IN_PACKAGES_TIME_DESC";