Changeset 12066

Timestamp:

06/25/08 06:25:52 (2 years ago)

Author:

asha

Message:

#5235 - PHP Timeout Settings (Configurable through config.inc.php) - Asha

Files:

• vtigercrm/branches/5.1/config.template.php (modified) (1 diff)
• vtigercrm/branches/5.1/index.php (modified) (1 diff)
• vtigercrm/branches/5.1/install/5createTables.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Import/ImportStep3.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Migration/DBChanges/42P2_to_50.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Migration/HTMLtoUTF8Conversion.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Migration/MigrationInfo.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Migration/MigrationStep0.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Migration/PatchApply.php (modified) (3 diffs)
• vtigercrm/branches/5.1/modules/Migration/index.php (modified) (2 diffs)
• vtigercrm/branches/5.1/modules/Reports/CreateXL.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Reports/ReportRun.php (modified) (4 diffs)
• vtigercrm/branches/5.1/modules/Users/RecalculateSharingRules.php (modified) (1 diff)

vtigercrm/branches/5.1/config.template.php

@@ -194 +194 @@
-$listview_max_textlength = 40;
-
+// Maximum time limit for PHP script execution (in seconds)
+$php_max_execution_time = 0;
+
-?>

vtigercrm/branches/5.1/index.php

@@ -104 +104 @@
-        require_once('config_override.php');
-}
- 
- 
+, "php_max_execution_time" => "0"
+
-set_default_config($default_config_values);
-require_once('include/logging.php');

vtigercrm/branches/5.1/install/5createTables.php

@@ -17 +17 @@
- * Description:  Executes a step in the installation process.
- ********************************************************************************/
-200
+
-
-if (isset($_REQUEST['db_name'])) $db_name                               = $_REQUEST['db_name'];

vtigercrm/branches/5.1/modules/Import/ImportStep3.php

@@ -37 +37 @@
-require_once('modules/Import/ImportSave.php');
-
-
+
+
-ini_set("display_errors",'0');
-

vtigercrm/branches/5.1/modules/Migration/DBChanges/42P2_to_50.php

@@ -11 +11 @@
-
-ini_set("memory_limit","32M");
-
+
+
-
-//This file is used to modify the database from 4.2Patch2 to 5.0 Alpha release

vtigercrm/branches/5.1/modules/Migration/HTMLtoUTF8Conversion.php

@@ -10 +10 @@
-
-ini_set("memory_limit","32M");
-
+
+
-
-echo '<div align = "center"><br><b>Started UTF8 Conversion</b><br></div>';

vtigercrm/branches/5.1/modules/Migration/MigrationInfo.php

@@ -283 +283 @@
-                                                <br />
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                                        </td>
-                                   </tr>
-                                   <tr bgcolor="#FFFFFF"><td colspan="2">&nbsp;</td></tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                                   <tr>
-                                        <td colspan="2" align="center">

vtigercrm/branches/5.1/modules/Migration/MigrationStep0.php

@@ -59 +59 @@
-        header("Location: index.php?module=Migration&action=index&parenttab=Settings");
-}
-
-
-
-
-
-
-
+
-$smarty->assign("CONVERSION_MSG", $data_conversion_msg[$db_migration_status]);
-

vtigercrm/branches/5.1/modules/Migration/PatchApply.php

@@ -11 +11 @@
-
-ini_set("memory_limit","32M");
-
+
+
-
-global $current_user;
@@ -135 +136 @@
-}
-
-//Added to check database charset and $default_charset are set to UTF8.
-//If both are not set to be UTF-8, Then we will show an alert message.
-/*
-function check_db_utf8_charset($conn) 
-{ 
-        $dbvarRS = &$conn->query("show variables like '%_database' "); 
-        $db_character_set = null; 
-        $db_collation_type = null; 
-        while(!$dbvarRS->EOF) { 
-                $arr = $dbvarRS->FetchRow(); 
-                $arr = array_change_key_case($arr); 
-                switch($arr['variable_name']) { 
-                case 'character_set_database' : $db_character_set = $arr['value']; break; 
-                case 'collation_database'     : $db_collation_type = $arr['value']; break; 
-                }
-                // If we have all the required information break the loop. 
-                if($db_character_set != null && $db_collation_type != null) break; 
-        } 
-        return (stristr($db_character_set, 'utf8') && stristr($db_collation_type, 'utf8')); 
-}
-
-/*      global $adb,$default_charset;
-        $db_status=check_db_utf8_charset($adb);
-        if(strtolower($default_charset) == 'utf-8')     $config_status=1;
-        else                                            $config_status=0;
-
-        if(!$db_status && !$config_status)
-        {
-                $msg='<br><font color="red"><b>Your database charset and $default_charset variable in config.inc.php are not set to UTF-8. Due to that you may not use UTF-8 characters in vtigerCRM. Please set the above to UTF-8</b></font>';
-        }
-        else if($db_status && !$config_status)
-        {
-                $msg='<br><font color="red"><b>Your database charset is set as UTF-8. But $default_charset variable in config.inc.php is not set to UTF-8. Due to that you may not use UTF-8 characters in vtigerCRM. Please set the $default_charset variable to UTF-8</b></font>';
-
-        }
-        else if(!$db_status && $config_status)
-        {
-                $msg='<br><font color="red"><b>Your $default_charset variable in config.inc.php is set as UTF-8. But your database charset is not set as UTF-8. Due to that you may not use UTF-8 characters in vtigerCRM. Please set your database charset to UTF-8</b></font>';
-
-        }
-        echo $msg;
-if(!$continue_42P2 && $db_change_conformation == true)
-{
-echo '<br><table border="1" cellpadding="3" cellspacing="0" height="100%" width="80%" align="center">
-                <tr>
-                <td colspan="2" align="center"><br>If you are migrating from 5.0.3 or earlier versions, which had partial unicode (UTF-8) support, the unicode characters got saved as HTML entities. <br>If you are going to use ISO charset in config file and in database, then you need not do conversion.<br> Click on "Convert Now" button to convert html entities into utf8 characters.<br><br> 
-                                        <form name="html_to_utf" method="post" action="index.php">
-                                        <input type="hidden" name="module" value="Migration">
-                                        <input type="hidden" name="action" value="HTMLtoUTF8Conversion">
-
-                                        <input type="submit" name="close" value=" &nbsp;Convert Now&nbsp; " class="crmbutton small save" />
-                                </form><br>
-                        </td>
-                </tr>
-        </table><br><br>';
-
-}
-//if($db_change_conformation == true)
-//{ */
-echo '<table width="95%"  border="0" align="center">
-        <tr bgcolor="#FFFFFF"><td colspan="2">&nbsp;</td></tr>
@@ -206 +148 @@
-                </tr>
-        </table><br><br>';
-
+
-perform_post_migration_activities();
-

vtigercrm/branches/5.1/modules/Migration/index.php

@@ -103 +103 @@
-}
-
-//Added to check database charset and $default_charset are set to UTF8.
-//If both are not set to be UTF-8, Then we will show an alert message.
-/*function check_db_utf8_support($conn) 
-{ 
-        $dbvarRS = &$conn->query("show variables like '%_database' "); 
-        $db_character_set = null; 
-        $db_collation_type = null; 
-        while(!$dbvarRS->EOF) { 
-                $arr = $dbvarRS->FetchRow(); 
-                $arr = array_change_key_case($arr); 
-                switch($arr['variable_name']) { 
-                case 'character_set_database' : $db_character_set = $arr['value']; break; 
-                case 'collation_database'     : $db_collation_type = $arr['value']; break; 
-                }
-                // If we have all the required information break the loop. 
-                if($db_character_set != null && $db_collation_type != null) break; 
-        } 
-        return (stristr($db_character_set, 'utf8') && stristr($db_collation_type, 'utf8')); 
-}
-        global $adb,$default_charset;
-        $db_status=check_db_utf8_support($adb);
-        if(strtolower($default_charset) == 'utf-8')     $config_status=1;
-        else                                            $config_status=0;
-
-        $db_migration_status =true;
-
-        if(!isset($db_character_set))
-        {
-        $result = $adb->query("show variables like 'character_set_database'");  
-        $row = $adb->fetch_array($result);
-        $db_character_set = $row['value'];
-        }
-        if(!$db_status && !$config_status)
-        {
-                $db_migration_status = false;
-                if($db_character_set =='latin1' && strtolower($default_charset) == 'iso-8859-1')
-                $db_migration_status = true;
-                $msg='<br/>';
-        }
-        else if($db_status && !$config_status)
-        {
-                $db_migration_status = false;
-                $msg='<br> If you want to use UTF-8 charset for both vtigerCRM server and database , please change the $default_charset variable to UTF-8 in config.inc.php file and click on the "Continue" button.<br/><b> Otherwise ';
-
-        }
-        else if(!$db_status && $config_status)
-        {
-                $db_migration_status = false;
-                $msg='<br> If you want to use UTF-8 charset for both vtigerCRM server and database , please click on the <b> "Use UTF-8 charset" </b> button. <br/><b> Otherwise  ';
-
-        }
- */     
-$smarty = new vtigerCRM_Smarty();
-
-//$smarty->assign("CHARSET_CHECK", $msg);
-
-$smarty->assign("MIG_CHECK", $status);
@@ -182 +129 @@
-global $vtiger_current_version;
-$smarty->assign("CURRENT_VERSION", $vtiger_current_version);
-/*
-if($db_migration_status == false)
-{
-        echo '<br><br>
-                <font color ="red"> <ul><li>Changes made to database during migration cannot be reverted back. So we highly recommend to take database dump of the current working database before migration.</ul></font><br/> <br/></table>';
-                
-        echo '  <table border="1" cellpadding ="2" cellspacing="0" height="100%" width="50%" align="center">
-                <tr><td>vtigerCRM Database Characterset </td><td>';
-                if(isset($db_character_set))
-                        echo $db_character_set;
-        echo '  </td></tr>
-                <tr><td>vtigerCRM Server Characterset </td><td>'.$default_charset.' </td></tr>
-                </table>';
-        echo '<br><br>
-                <table border="1" cellpadding="3" cellspacing="0" height="100%" width="80%" align="center">
-                <tr>
-                <td colspan="2" align="center"><br>';
-        echo '<font color ="red"> <br/> There is a conflict between the vtigerCRM server characterset and database characterset. ';
-        echo $msg;
-        echo '<b> Specify the same character set both in vtigerCRM server & database and click on the "Continue" button to proceed with Migration.</b> </font> ';
-        echo '<br><br><form name="html_to_utf" method="post" action="index.php">
-                                        <input type="hidden" name="module" value="Migration">
-                                        <input type="hidden" name="action" value="index">
-                                        <input type="hidden" name="dbconversionutf8" value = "">
-                                        <input type="hidden" name="parenttab" value="Settings">';
-                                if(!$db_status && $config_status){      
-                        echo    '<input type="button" name="close" value=" &nbsp; Use UTF-8 Charset &nbsp; " onclick ="dbcovert();" class="crmbutton small save" />';
-}
-                echo  ' <input type="submit" name="close" value=" &nbsp;Continue &nbsp; " class="crmbutton small save" />
-                        </form>
-<script>function dbcovert(){getObj("dbconversionutf8").value="yes";document.html_to_utf.submit();}</script>
-                        <br>
-                        </td>
-                </tr>
-        </table><br><br>';
-
-
-
-
-
-
-
-
+
-
-?>

vtigercrm/branches/5.1/modules/Reports/CreateXL.php

@@ -9 +9 @@
-*
-********************************************************************************/
-
+
+
-
-require_once("include/php_writeexcel/class.writeexcel_workbook.inc.php");

vtigercrm/branches/5.1/modules/Reports/ReportRun.php

@@ -1802 +1802 @@
-        function GenerateReport($outputformat,$filterlist)
-        {
-
+,$php_max_execution_time
-                global $modules,$app_strings;
-                global $mod_strings,$current_language;
@@ -1961 +1961 @@
-                                        $thirdvalue = $tnewvalue;
-                                        $arr_val[] = $arraylists;
-0
+$php_max_execution_time
-                                }while($custom_field_values = $adb->fetch_array($result));
-
@@ -2052 +2052 @@
-                                        }
-                                        $arr_val[] = $arraylists;
-0
+$php_max_execution_time
-                                }while($custom_field_values = $adb->fetch_array($result));
-
@@ -2283 +2283 @@
-                                         $thirdvalue = $tnewvalue;
-                                         $arr_val[] = $arraylists;
-0
+$php_max_execution_time
-                                }while($custom_field_values = $adb->fetch_array($result));
-                                

vtigercrm/branches/5.1/modules/Users/RecalculateSharingRules.php

@@ -9 +9 @@
-*
- ********************************************************************************/
-
--1
+
+$php_max_execution_time
-RecalculateSharingRules();
-