New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / extensions / ext-rewrite.php

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 0a72c21c0541144b03f2571e2f96581f5e180b70..15f0bc6d73f78a70bc6c6a5716f9155228d9b371 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -52,7 +52,7 @@ switch ($EXT_LOAD_MODE)
 {
 case 'register': // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Check if mod_rewrite is loadeded
 {
 case 'register': // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Check if mod_rewrite is loadeded

-       if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
+       if (!isApacheModuleLoaded('mod_rewrite')){

                EXT_SET_REPORTS_FAILURE(true);
                addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
        } // END - if
                EXT_SET_REPORTS_FAILURE(true);
                addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
        } // END - if


@@ -68,8 +68,8 @@ case 'remove': // Do stuff when removing extension
 
 case 'activate': // Do stuff when admin activates this extension
        // Check if mod_rewrite is loadeded
 
 case 'activate': // Do stuff when admin activates this extension
        // Check if mod_rewrite is loadeded

-       if (!IF_APACHE_MODULE_LOADED('mod_rewrite')) {
-               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
+       if (!isApacheModuleLoaded('mod_rewrite')) {
+               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);

                EXT_SET_REPORTS_FAILURE(true);
                addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
         } // END - if
                EXT_SET_REPORTS_FAILURE(true);
                addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
         } // END - if


@@ -148,7 +148,7 @@ case 'update': // Update an extension
                break;
        case '0.1.3':
                // Check if mod_rewrite is loadeded
                break;
        case '0.1.3':
                // Check if mod_rewrite is loadeded

-               if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
+               if (!isApacheModuleLoaded('mod_rewrite')){

                        EXT_SET_REPORTS_FAILURE(true);
                        //addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
                } // END - if
                        EXT_SET_REPORTS_FAILURE(true);
                        //addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
                } // END - if


@@ -165,9 +165,9 @@ case 'test': // For testing purposes. For details see file inc/modules/admin/wha
 
 default: // Do stuff when extension is loaded
        // Check if mod_rewrite is loadeded
 
 default: // Do stuff when extension is loaded
        // Check if mod_rewrite is loadeded

-       if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
+       if (!isApacheModuleLoaded('mod_rewrite')){

                EXT_SET_REPORTS_FAILURE(true);
                EXT_SET_REPORTS_FAILURE(true);

-               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
+               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);

                if (!IS_ADMIN()) addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
         } // END - if
        break;
                if (!IS_ADMIN()) addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
         } // END - if
        break;