adamjakab / SuiteCRM

modules/Administration/DiagnosticRun.php

Indentation +250 added lines, -250 removed lines

@@ -69,12 +69,12 @@ 
 global $db;
 if(empty($db)) {
 
-	$db = DBManagerFactory::getInstance();
+    $db = DBManagerFactory::getInstance();
 }
 
 global $current_user;
 if(!is_admin($current_user)){
-	die($mod_strings['LBL_DIAGNOSTIC_ACCESS']);
+    die($mod_strings['LBL_DIAGNOSTIC_ACCESS']);
 }
 global $sugar_config;
 global $beanFiles;
@@ -132,11 +132,11 @@ 
 
     $currentitems++;
     if($currentitems == $totalitems)
-      update_progress_bar("diagnostic", 100, 100);
+        update_progress_bar("diagnostic", 100, 100);
     else
     {
-      $progress_bar_percent += ($itemweight / $GLOBALS['totalweight'] * 100);
-      update_progress_bar("diagnostic", $progress_bar_percent, 100);
+        $progress_bar_percent += ($itemweight / $GLOBALS['totalweight'] * 100);
+        update_progress_bar("diagnostic", $progress_bar_percent, 100);
     }
 }
 
@@ -158,7 +158,7 @@ 
 
     $contents .= "<tr colspan=\"$cols\">$header</tr><tr>";
     foreach($keys as $key) {
-       $contents .= "<th class=\"tabDetailViewDL\"><b>$key</b></th>";
+        $contents .= "<th class=\"tabDetailViewDL\"><b>$key</b></th>";
     }
     $contents .= "</tr>";
     foreach($values as $field) {
@@ -180,7 +180,7 @@ 
 // returns a string containing (in html) the dump of all rows
 function getFullTableDump($tableName){
 
-	global $db;
+    global $db;
 
     $cols = $db->get_columns($tableName);
     $indexes = $db->get_indices($tableName);
@@ -192,7 +192,7 @@ 
 
     $def_count = count($cols);
 
-	$td_result = $db->query("select * from ".$tableName);
+    $td_result = $db->query("select * from ".$tableName);
     if(!$td_result) {
         return $db->lastError();
     }
@@ -204,124 +204,124 @@ 
     }
     $returnString .= "</tr>";
     $row_counter = 1;
-	while($row = $db->fetchByAssoc($td_result))
-	{
-		$row = array_values($row);
-		$returnString .= "<tr>";
-		$returnString .= "<td class=\"tabDetailViewDL\">".$row_counter."</td>";
-		for($counter = 0; $counter < $def_count; $counter++) {
+    while($row = $db->fetchByAssoc($td_result))
+    {
+        $row = array_values($row);
+        $returnString .= "<tr>";
+        $returnString .= "<td class=\"tabDetailViewDL\">".$row_counter."</td>";
+        for($counter = 0; $counter < $def_count; $counter++) {
             $replace_val = false;
-			//perform this check when counter is set to two, which means it is on the 'value' column
-			if($counter == 2) {
-				//if the previous "name" column value was set to smtppass, set replace_val to true
-				if(strcmp($row[$counter - 1], "smtppass") == 0  )
-					$replace_val = true;
-
-				//if the previous "name" column value was set to smtppass,
-				//and the "category" value set to ldap, set replace_val to true
-				if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0)
-					$replace_val = true;
-
-				//if the previous "name" column value was set to password,
-				//and the "category" value set to proxy, set replace_val to true
-				if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 )
-					$replace_val = true;
-			}
-
-			if($replace_val) {
-					$returnString .= "<td class=\"tabDetailViewDF\">********</td>";
+            //perform this check when counter is set to two, which means it is on the 'value' column
+            if($counter == 2) {
+                //if the previous "name" column value was set to smtppass, set replace_val to true
+                if(strcmp($row[$counter - 1], "smtppass") == 0  )
+                    $replace_val = true;
+
+                //if the previous "name" column value was set to smtppass,
+                //and the "category" value set to ldap, set replace_val to true
+                if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0)
+                    $replace_val = true;
+
+                //if the previous "name" column value was set to password,
+                //and the "category" value set to proxy, set replace_val to true
+                if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 )
+                    $replace_val = true;
+            }
+
+            if($replace_val) {
+                    $returnString .= "<td class=\"tabDetailViewDF\">********</td>";
             } else {
-					$returnString .= "<td class=\"tabDetailViewDF\">".($row[$counter] == "" ? "&nbsp;" : $row[$counter])."</td>";
-			}
-	    }
+                    $returnString .= "<td class=\"tabDetailViewDF\">".($row[$counter] == "" ? "&nbsp;" : $row[$counter])."</td>";
+            }
+        }
         $row_counter++;
         $returnString .= "</tr>";
     }
-	$returnString .= "</table>";
+    $returnString .= "</table>";
 
-	return $returnString;
+    return $returnString;
 }
 
 // Deletes the directory recursively
 function deleteDir($dir)
 {
-   if (substr($dir, strlen($dir)-1, 1) != '/')
-       $dir .= '/';
-
-   if ($handle = opendir($dir))
-   {
-       while ($obj = readdir($handle))
-       {
-           if ($obj != '.' && $obj != '..')
-           {
-               if (is_dir($dir.$obj))
-               {
-                   if (!deleteDir($dir.$obj))
-                       return false;
-               }
-               elseif (is_file($dir.$obj))
-               {
-                   if (!unlink($dir.$obj))
-                       return false;
-               }
-           }
-       }
-
-       closedir($handle);
-
-       if (!@rmdir($dir))
-           return false;
-       return true;
-   }
-   return false;
+    if (substr($dir, strlen($dir)-1, 1) != '/')
+        $dir .= '/';
+
+    if ($handle = opendir($dir))
+    {
+        while ($obj = readdir($handle))
+        {
+            if ($obj != '.' && $obj != '..')
+            {
+                if (is_dir($dir.$obj))
+                {
+                    if (!deleteDir($dir.$obj))
+                        return false;
+                }
+                elseif (is_file($dir.$obj))
+                {
+                    if (!unlink($dir.$obj))
+                        return false;
+                }
+            }
+        }
+
+        closedir($handle);
+
+        if (!@rmdir($dir))
+            return false;
+        return true;
+    }
+    return false;
 }
 
 
 function prepareDiag()
 {
-	global $getDumpsFrom;
-	global $cacheDir;
-	global $curdatetime;
-	global $progress_bar_percent;
-	global $skip_md5_diff;
-	global $sod_guid;
-	global $mod_strings;
-
-	echo getClassicModuleTitle(
+    global $getDumpsFrom;
+    global $cacheDir;
+    global $curdatetime;
+    global $progress_bar_percent;
+    global $skip_md5_diff;
+    global $sod_guid;
+    global $mod_strings;
+
+    echo getClassicModuleTitle(
         "Administration",
         array(
             "<a href='index.php?module=Administration&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>",
-           translate('LBL_DIAGNOSTIC_TITLE')
-           ),
+            translate('LBL_DIAGNOSTIC_TITLE')
+            ),
         false
         );
-	echo "<BR>";
-	echo $mod_strings['LBL_DIAGNOSTIC_EXECUTING'];
-	echo "<BR>";
+    echo "<BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_EXECUTING'];
+    echo "<BR>";
 
 
-	//determine if files.md5 exists or not
-	if(file_exists('files.md5'))
-		$skip_md5_diff = false;
-	else
-		$skip_md5_diff = true;
+    //determine if files.md5 exists or not
+    if(file_exists('files.md5'))
+        $skip_md5_diff = false;
+    else
+        $skip_md5_diff = true;
 
-	// array of all tables that we need to pull rows from below
-	$getDumpsFrom = array('config' => 'config',
-	                      'fields_meta_data' => 'fields_meta_data',
-	                      'upgrade_history' => 'upgrade_history',
-	                      'versions' => 'versions',
-	                      );
+    // array of all tables that we need to pull rows from below
+    $getDumpsFrom = array('config' => 'config',
+                            'fields_meta_data' => 'fields_meta_data',
+                            'upgrade_history' => 'upgrade_history',
+                            'versions' => 'versions',
+                            );
 
 
-	//Creates the diagnostic directory in the cache directory
+    //Creates the diagnostic directory in the cache directory
     $cacheDir = create_cache_directory("diagnostic/");
     $cacheDir = create_cache_directory("diagnostic/".$sod_guid);
     $cacheDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/");
 
-	display_progress_bar("diagnostic", $progress_bar_percent, 100);
+    display_progress_bar("diagnostic", $progress_bar_percent, 100);
 
-	ob_flush();
+    ob_flush();
 }
 
 function executesugarlog()
@@ -329,10 +329,10 @@ 
     //BEGIN COPY SUGARCRM.LOG
     //Copies the Sugarcrm log to our diagnostic directory
     global $cacheDir;
-	require_once('include/SugarLogger/SugarLogger.php');
-	$logger = new SugarLogger();
+    require_once('include/SugarLogger/SugarLogger.php');
+    $logger = new SugarLogger();
     if(!copy($logger->getLogFileNameWithPath(), $cacheDir.'/'.$logger->getLogFileName())) {
-      echo "Couldn't copy suitecrm.log to cacheDir.<br>";
+        echo "Couldn't copy suitecrm.log to cacheDir.<br>";
     }
     //END COPY SUGARCRM.LOG
 
@@ -353,7 +353,7 @@ 
 
     $handle = sugar_fopen($cacheDir."phpinfo.html", "w");
     if(fwrite($handle, $phpinfo) === FALSE){
-      echo "Cannot write to file ".$cacheDir."phpinfo.html<br>";
+        echo "Cannot write to file ".$cacheDir."phpinfo.html<br>";
     }
     fclose($handle);
     //END GETPHPINFO
@@ -393,7 +393,7 @@ 
 
     //create directory for table definitions
     if($getschema)
-      $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
+        $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
 
     //make sure they checked the box to get basic info
     if($getinfo)
@@ -483,36 +483,36 @@ 
         foreach($all_tables as $tablename){
             $cols = $db->get_columns($tablename);
             $indexes = $db->get_indices($tablename);
-			//setting up table header for each file
+            //setting up table header for each file
             $contents .= array_as_table("{$db->dbName} $tablename Definitions:", $cols);
             $contents .= array_as_table("{$db->dbName} $tablename Keys:", $indexes);
-			$contents .= "<BR><BR>";
-		}
+            $contents .= "<BR><BR>";
+        }
 
         file_put_contents($tablesSchemaDir."{$db->dbName}TablesSchema.html", $contents);
-		//END GET ALL TABLES SCHEMAS
-		//BEGIN UPDATING PROGRESS BAR
-		sodUpdateProgressBar(SQL_SCHEMA_WEIGHT);
-		//END UPDATING PROGRESS BAR
+        //END GET ALL TABLES SCHEMAS
+        //BEGIN UPDATING PROGRESS BAR
+        sodUpdateProgressBar(SQL_SCHEMA_WEIGHT);
+        //END UPDATING PROGRESS BAR
     }
 
     if($getdumps)
     {
-		//BEGIN GET TABLEDUMPS
-		$tableDumpsDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableDumps/");
+        //BEGIN GET TABLEDUMPS
+        $tableDumpsDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableDumps/");
 
 
-		foreach ($getDumpsFrom as $table)
-		{
-			//calling function defined above to get the string for dump
-			$contents = $style .getFullTableDump($table);
+        foreach ($getDumpsFrom as $table)
+        {
+            //calling function defined above to get the string for dump
+            $contents = $style .getFullTableDump($table);
             file_put_contents($tableDumpsDir.$table.".html", $contents);
-		}
-		//END GET TABLEDUMPS
-		//BEGIN UPDATING PROGRESS BAR
-		sodUpdateProgressBar(SQL_DUMPS_WEIGHT);
-		//END UPDATING PROGRESS BAR
-	}
+        }
+        //END GET TABLEDUMPS
+        //BEGIN UPDATING PROGRESS BAR
+        sodUpdateProgressBar(SQL_DUMPS_WEIGHT);
+        //END UPDATING PROGRESS BAR
+    }
     //END GET DB INFO
 }
 
@@ -542,27 +542,27 @@ 
     echo "</font>";
     echo "<BR><BR>";
 
-	foreach ($beanList as $beanz)
-	{
-		if(!isset($beanFiles[$beanz]))
-		{
-			echo "<font color=orange>NO! --- ".$beanz." is not an index in \$beanFiles</font><br>";
-		}
-		else
-		{
-			if(file_exists($beanFiles[$beanz]))
-				echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
-			else
-				echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
-		}
-	}
-
-	$content = ob_get_contents();
-	ob_clean();
-
-	$handle = sugar_fopen($cacheDir."beanFiles.html", "w");
-	if(fwrite($handle, $content) === FALSE){
-    	echo "Cannot write to file ".$cacheDir."beanFiles.html<br>";
+    foreach ($beanList as $beanz)
+    {
+        if(!isset($beanFiles[$beanz]))
+        {
+            echo "<font color=orange>NO! --- ".$beanz." is not an index in \$beanFiles</font><br>";
+        }
+        else
+        {
+            if(file_exists($beanFiles[$beanz]))
+                echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
+            else
+                echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
+        }
+    }
+
+    $content = ob_get_contents();
+    ob_clean();
+
+    $handle = sugar_fopen($cacheDir."beanFiles.html", "w");
+    if(fwrite($handle, $content) === FALSE){
+        echo "Cannot write to file ".$cacheDir."beanFiles.html<br>";
     }
     fclose($handle);
     //END CHECK BEANLIST FILES ARE AVAILABLE
@@ -585,38 +585,38 @@ 
 
 function executemd5($filesmd5, $md5calculated)
 {
-	//BEGIN ALL MD5 CHECKS
-	global $curdatetime;
-	global $skip_md5_diff;
-	global $sod_guid;
-	if(file_exists('files.md5'))
+    //BEGIN ALL MD5 CHECKS
+    global $curdatetime;
+    global $skip_md5_diff;
+    global $sod_guid;
+    if(file_exists('files.md5'))
         include( 'files.md5');
-	//create dir for md5s
-	$md5_directory = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/md5/");
+    //create dir for md5s
+    $md5_directory = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/md5/");
 
-	//skip this if the files.md5 didn't exist
-	if(!$skip_md5_diff)
-	{
-		//make sure the files.md5
-		if($filesmd5)
-			if(!copy('files.md5', $md5_directory."files.md5"))
-				echo "Couldn't copy files.md5 to ".$md5_directory."<br>Skipping md5 checks.<br>";
-	}
+    //skip this if the files.md5 didn't exist
+    if(!$skip_md5_diff)
+    {
+        //make sure the files.md5
+        if($filesmd5)
+            if(!copy('files.md5', $md5_directory."files.md5"))
+                echo "Couldn't copy files.md5 to ".$md5_directory."<br>Skipping md5 checks.<br>";
+    }
 
-	$md5_string_calculated = generateMD5array('./');
+    $md5_string_calculated = generateMD5array('./');
 
-	if($md5calculated)
-		write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
+    if($md5calculated)
+        write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
 
 
-	//if the files.md5 didn't exist, we can't do this
-	if(!$skip_md5_diff)
-	{
-		$md5_string_diff = array_diff($md5_string_calculated, $md5_string);
+    //if the files.md5 didn't exist, we can't do this
+    if(!$skip_md5_diff)
+    {
+        $md5_string_diff = array_diff($md5_string_calculated, $md5_string);
 
-		write_array_to_file('md5_string_diff', $md5_string_diff, $md5_directory."md5_array_diff.php");
-	}
-	//END ALL MD5 CHECKS
+        write_array_to_file('md5_string_diff', $md5_string_diff, $md5_directory."md5_array_diff.php");
+    }
+    //END ALL MD5 CHECKS
     //BEGIN UPDATING PROGRESS BAR
     sodUpdateProgressBar(MD5_WEIGHT);
     //END UPDATING PROGRESS BAR
@@ -639,14 +639,14 @@ 
 
     ob_start();
     foreach ( $beanList as $beanz ) {
-      // echo "Module: ".$beanz."<br>";
-
-	$path_parts = pathinfo( $beanFiles[ $beanz ] );
-	$vardefFileName = $path_parts[ 'dirname' ]."/vardefs.php";
-	  if( file_exists( $vardefFileName )) {
-	    // echo "<br>".$vardefFileName."<br>";
-      }
-      include_once( $vardefFileName );
+        // echo "Module: ".$beanz."<br>";
+
+    $path_parts = pathinfo( $beanFiles[ $beanz ] );
+    $vardefFileName = $path_parts[ 'dirname' ]."/vardefs.php";
+        if( file_exists( $vardefFileName )) {
+        // echo "<br>".$vardefFileName."<br>";
+        }
+        include_once( $vardefFileName );
     }
 
     echo "<html lang='en'>";
@@ -659,22 +659,22 @@ 
 
     $tables = array();
     foreach($dictionary as $vardef) {
-	$tables[] = $vardef['table'];
-	$fields[$vardef['table']] = $vardef['fields'];
-	$comments[$vardef['table']] = $vardef['comment'];
+    $tables[] = $vardef['table'];
+    $fields[$vardef['table']] = $vardef['fields'];
+    $comments[$vardef['table']] = $vardef['comment'];
     }
 
     asort($tables);
 
     foreach($tables as $t) {
-	$name = $t;
-	if ( $name == "does_not_exist" )
-	  continue;
-	$comment = $comments[$t];
-	echo "<h2>Table: $t</h2>
+    $name = $t;
+    if ( $name == "does_not_exist" )
+        continue;
+    $comment = $comments[$t];
+    echo "<h2>Table: $t</h2>
 		<p><i>{$comment}</i></p>";
-	echo "<table border=\"0\" cellpadding=\"3\" class=\"tabDetailView\">";
-	echo '<TR BGCOLOR="#DFDFDF">
+    echo "<table border=\"0\" cellpadding=\"3\" class=\"tabDetailView\">";
+    echo '<TR BGCOLOR="#DFDFDF">
 		<TD NOWRAP ALIGN=left class=\"tabDetailViewDL\">Column</TD>
 		<TD NOWRAP class=\"tabDetailViewDL\">Type</TD>
 		<TD NOWRAP class=\"tabDetailViewDL\">Length</TD>
@@ -682,36 +682,36 @@ 
 		<TD NOWRAP class=\"tabDetailViewDL\">Comment</TD>
 	</TR>';
 
-	ksort( $fields[ $t ] );
-
-	foreach($fields[$t] as $k => $v) {
-	  // we only care about physical tables ('source' can be 'non-db' or 'nondb' or 'function' )
-	  if ( isset( $v[ 'source' ] ))
-	    continue;
-	  $columnname = $v[ 'name' ];
-	  $columntype = $v[ 'type' ];
-	  $columndbtype = $v[ 'dbType' ];
-	  $columnlen = $v[ 'len' ];
-	  $columncomment = $v[ 'comment' ];
-	  $columnrequired = $v[ 'required' ];
-
-	  if ( empty( $columnlen ) ) $columnlen = '<i>n/a</i>';
-	  if ( empty( $columncomment ) ) $columncomment = '<i>(none)</i>';
-	  if ( !empty( $columndbtype ) ) $columntype = $columndbtype;
-	  if ( empty( $columnrequired ) || ( $columnrequired == false ))
-	    $columndisplayrequired = 'no';
-	  else
-	    $columndisplayrequired = 'yes';
-
-	  echo '<TR BGCOLOR="#FFFFFF" ALIGN=left>
+    ksort( $fields[ $t ] );
+
+    foreach($fields[$t] as $k => $v) {
+        // we only care about physical tables ('source' can be 'non-db' or 'nondb' or 'function' )
+        if ( isset( $v[ 'source' ] ))
+        continue;
+        $columnname = $v[ 'name' ];
+        $columntype = $v[ 'type' ];
+        $columndbtype = $v[ 'dbType' ];
+        $columnlen = $v[ 'len' ];
+        $columncomment = $v[ 'comment' ];
+        $columnrequired = $v[ 'required' ];
+
+        if ( empty( $columnlen ) ) $columnlen = '<i>n/a</i>';
+        if ( empty( $columncomment ) ) $columncomment = '<i>(none)</i>';
+        if ( !empty( $columndbtype ) ) $columntype = $columndbtype;
+        if ( empty( $columnrequired ) || ( $columnrequired == false ))
+        $columndisplayrequired = 'no';
+        else
+        $columndisplayrequired = 'yes';
+
+        echo '<TR BGCOLOR="#FFFFFF" ALIGN=left>
 			<TD ALIGN=left class=\"tabDetailViewDF\">'.$columnname.'</TD>
 	  		<TD NOWRAP class=\"tabDetailViewDF\">'.$columntype.'</TD>
 			<TD NOWRAP class=\"tabDetailViewDF\">'.$columnlen.'</TD>
 			<TD NOWRAP class=\"tabDetailViewDF"\">'.$columndisplayrequired.'</TD>
 			<TD WRAP class=\"tabDetailViewDF\">'.$columncomment.'</TD></TR>';
-	}
+    }
 
-	echo "</table></p>";
+    echo "</table></p>";
     }
 
     echo "</body></html>";
@@ -721,7 +721,7 @@ 
 
     $handle = sugar_fopen($cacheDir."vardefschema.html", "w");
     if(fwrite($handle, $vardefFormattedOutput) === FALSE){
-      echo "Cannot write to file ".$cacheDir."vardefschema.html<br>";
+        echo "Cannot write to file ".$cacheDir."vardefschema.html<br>";
     }
     fclose($handle);
     sodUpdateProgressBar(VARDEFS_WEIGHT);
@@ -729,23 +729,23 @@ 
 }
 
 function finishDiag(){
-	//BEGIN ZIP ALL FILES AND EXTRACT IN CACHE ROOT
-	global $cacheDir;
-	global $curdatetime;
-	global $sod_guid;
-	global $mod_strings;
-
-	chdir($cacheDir);
-	zip_dir(".", "../diagnostic".$curdatetime.".zip");
-	//END ZIP ALL FILES AND EXTRACT IN CACHE ROOT
-	chdir(RETURN_FROM_DIAG_DIR);
-
-	deleteDir($cacheDir);
+    //BEGIN ZIP ALL FILES AND EXTRACT IN CACHE ROOT
+    global $cacheDir;
+    global $curdatetime;
+    global $sod_guid;
+    global $mod_strings;
+
+    chdir($cacheDir);
+    zip_dir(".", "../diagnostic".$curdatetime.".zip");
+    //END ZIP ALL FILES AND EXTRACT IN CACHE ROOT
+    chdir(RETURN_FROM_DIAG_DIR);
+
+    deleteDir($cacheDir);
 	
 	
-	print "<a href=\"index.php?module=Administration&action=DiagnosticDownload&guid=$sod_guid&time=$curdatetime&to_pdf=1\">".$mod_strings['LBL_DIAGNOSTIC_DOWNLOADLINK']."</a><BR>";
+    print "<a href=\"index.php?module=Administration&action=DiagnosticDownload&guid=$sod_guid&time=$curdatetime&to_pdf=1\">".$mod_strings['LBL_DIAGNOSTIC_DOWNLOADLINK']."</a><BR>";
 
-	print "<a href=\"index.php?module=Administration&action=DiagnosticDelete&file=diagnostic".$curdatetime."&guid=".$sod_guid."\">".$mod_strings['LBL_DIAGNOSTIC_DELETELINK']."</a><br>";
+    print "<a href=\"index.php?module=Administration&action=DiagnosticDelete&file=diagnostic".$curdatetime."&guid=".$sod_guid."\">".$mod_strings['LBL_DIAGNOSTIC_DELETELINK']."</a><br>";
 
 }
 
@@ -786,55 +786,55 @@ 
 
 if($doconfigphp)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETCONFPHP']."<BR>";
-  executeconfigphp();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETCONFPHP']."<BR>";
+    executeconfigphp();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($docustom_dir)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETCUSTDIR']."<BR>";
-  executecustom_dir();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETCUSTDIR']."<BR>";
+    executecustom_dir();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dophpinfo)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETPHPINFO']."<BR>";
-  executephpinfo();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETPHPINFO']."<BR>";
+    executephpinfo();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($domysql_info || $domysql_dumps || $domysql_schema)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETTING'].
-                 ($domysql_info ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLINFO'] : " ").
-                 ($domysql_dumps ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTD'] : " ").
-                 ($domysql_schema ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTS'] : "...").
-                 "<BR>";
-  execute_sql($domysql_info, $domysql_dumps, $domysql_schema);
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETTING'].
+                    ($domysql_info ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLINFO'] : " ").
+                    ($domysql_dumps ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTD'] : " ").
+                    ($domysql_schema ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTS'] : "...").
+                    "<BR>";
+    execute_sql($domysql_info, $domysql_dumps, $domysql_schema);
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($domd5)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETMD5INFO']."<BR>";
-  executemd5($domd5filesmd5, $domd5calculated);
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETMD5INFO']."<BR>";
+    executemd5($domd5filesmd5, $domd5calculated);
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dobeanlistbeanfiles)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETBEANFILES']."<BR>";
-  executebeanlistbeanfiles();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETBEANFILES']."<BR>";
+    executebeanlistbeanfiles();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dosugarlog)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETSUGARLOG']."<BR>";
-  executesugarlog();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETSUGARLOG']."<BR>";
+    executesugarlog();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dovardefs)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_VARDEFS']."<BR>";
-  executevardefs();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_VARDEFS']."<BR>";
+    executevardefs();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 
 //finish up the last steps

Spacing +87 added lines, -87 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -41,8 +41,8 @@ 
 
 
 
-require_once( 'include/utils/progress_bar_utils.php' );
-require_once( 'include/utils/zip_utils.php' );
+require_once('include/utils/progress_bar_utils.php');
+require_once('include/utils/zip_utils.php');
 
 global $current_user;
 
@@ -67,13 +67,13 @@ 
 
 
 global $db;
-if(empty($db)) {
+if (empty($db)) {
 
 	$db = DBManagerFactory::getInstance();
 }
 
 global $current_user;
-if(!is_admin($current_user)){
+if (!is_admin($current_user)) {
 	die($mod_strings['LBL_DIAGNOSTIC_ACCESS']);
 }
 global $sugar_config;
@@ -124,14 +124,14 @@ 
 global $cacheDir;
 $cacheDir = "";
 
-function sodUpdateProgressBar($itemweight){
+function sodUpdateProgressBar($itemweight) {
     global $progress_bar_percent;
     global $totalweight;
     global $totalitems;
     global $currentitems;
 
     $currentitems++;
-    if($currentitems == $totalitems)
+    if ($currentitems == $totalitems)
       update_progress_bar("diagnostic", 100, 100);
     else
     {
@@ -151,20 +151,20 @@ 
 {
     $contents = "<table border=\"0\" cellpadding=\"0\" class=\"tabDetailView\">";
     $keys = array();
-    foreach($values as $field) {
+    foreach ($values as $field) {
         $keys = array_unique($keys + array_keys($field));
     }
     $cols = count($keys);
 
     $contents .= "<tr colspan=\"$cols\">$header</tr><tr>";
-    foreach($keys as $key) {
+    foreach ($keys as $key) {
        $contents .= "<th class=\"tabDetailViewDL\"><b>$key</b></th>";
     }
     $contents .= "</tr>";
-    foreach($values as $field) {
+    foreach ($values as $field) {
         $contents .= "<tr>";
-        foreach($field as $item) {
-            if(is_array($item)) {
+        foreach ($field as $item) {
+            if (is_array($item)) {
                 $item = join(",", $item);
             }
             $contents .= "<td class=\"tabDetailViewDF\">$item</td>";
@@ -178,7 +178,7 @@ 
 // expects a string containing the name of the table you would like to get the dump of
 // expects there to already be a connection to the db and the 'use database_name' to be done
 // returns a string containing (in html) the dump of all rows
-function getFullTableDump($tableName){
+function getFullTableDump($tableName) {
 
 	global $db;
 
@@ -193,28 +193,28 @@ 
     $def_count = count($cols);
 
 	$td_result = $db->query("select * from ".$tableName);
-    if(!$td_result) {
+    if (!$td_result) {
         return $db->lastError();
     }
     $returnString .= "<table border=\"0\" cellpadding=\"0\" class=\"tabDetailView\"><tr><th class=\"tabDetailViewDL\">#</th>";
     $fields = $db->getFieldsArray($td_result);
-    foreach($fields as $field) {
+    foreach ($fields as $field) {
         $returnString .= "<th class=\"tabDetailViewDL\">$field</th>";
 
     }
     $returnString .= "</tr>";
     $row_counter = 1;
-	while($row = $db->fetchByAssoc($td_result))
+	while ($row = $db->fetchByAssoc($td_result))
 	{
 		$row = array_values($row);
 		$returnString .= "<tr>";
 		$returnString .= "<td class=\"tabDetailViewDL\">".$row_counter."</td>";
-		for($counter = 0; $counter < $def_count; $counter++) {
+		for ($counter = 0; $counter < $def_count; $counter++) {
             $replace_val = false;
 			//perform this check when counter is set to two, which means it is on the 'value' column
-			if($counter == 2) {
+			if ($counter == 2) {
 				//if the previous "name" column value was set to smtppass, set replace_val to true
-				if(strcmp($row[$counter - 1], "smtppass") == 0  )
+				if (strcmp($row[$counter - 1], "smtppass") == 0)
 					$replace_val = true;
 
 				//if the previous "name" column value was set to smtppass,
@@ -224,11 +224,11 @@ 
 
 				//if the previous "name" column value was set to password,
 				//and the "category" value set to proxy, set replace_val to true
-				if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 )
+				if (strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0)
 					$replace_val = true;
 			}
 
-			if($replace_val) {
+			if ($replace_val) {
 					$returnString .= "<td class=\"tabDetailViewDF\">********</td>";
             } else {
 					$returnString .= "<td class=\"tabDetailViewDF\">".($row[$counter] == "" ? "&nbsp;" : $row[$counter])."</td>";
@@ -245,7 +245,7 @@ 
 // Deletes the directory recursively
 function deleteDir($dir)
 {
-   if (substr($dir, strlen($dir)-1, 1) != '/')
+   if (substr($dir, strlen($dir) - 1, 1) != '/')
        $dir .= '/';
 
    if ($handle = opendir($dir))
@@ -301,7 +301,7 @@ 
 
 
 	//determine if files.md5 exists or not
-	if(file_exists('files.md5'))
+	if (file_exists('files.md5'))
 		$skip_md5_diff = false;
 	else
 		$skip_md5_diff = true;
@@ -331,7 +331,7 @@ 
     global $cacheDir;
 	require_once('include/SugarLogger/SugarLogger.php');
 	$logger = new SugarLogger();
-    if(!copy($logger->getLogFileNameWithPath(), $cacheDir.'/'.$logger->getLogFileName())) {
+    if (!copy($logger->getLogFileNameWithPath(), $cacheDir.'/'.$logger->getLogFileName())) {
       echo "Couldn't copy suitecrm.log to cacheDir.<br>";
     }
     //END COPY SUGARCRM.LOG
@@ -352,7 +352,7 @@ 
     ob_clean();
 
     $handle = sugar_fopen($cacheDir."phpinfo.html", "w");
-    if(fwrite($handle, $phpinfo) === FALSE){
+    if (fwrite($handle, $phpinfo) === FALSE) {
       echo "Cannot write to file ".$cacheDir."phpinfo.html<br>";
     }
     fclose($handle);
@@ -366,7 +366,7 @@ 
 {
     //BEGIN COPY CONFIG.PHP
     //store db_password in temp var so we can get config.php w/o making anyone angry
-    global $cacheDir;    global $sugar_config;
+    global $cacheDir; global $sugar_config;
 
     $tempPass = $sugar_config['dbconfig']['db_password'];
     $sugar_config['dbconfig']['db_password'] = '********';
@@ -392,20 +392,20 @@ 
 
 
     //create directory for table definitions
-    if($getschema)
+    if ($getschema)
       $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
 
     //make sure they checked the box to get basic info
-    if($getinfo)
+    if ($getinfo)
     {
         $info = $db->getDbInfo();
         $content = '';
-        if(!empty($info)) {
-            foreach($info as $name => $value) {
+        if (!empty($info)) {
+            foreach ($info as $name => $value) {
                 $content .= "$name: $value<BR>";
             }
         }
-        if(!empty($content)) {
+        if (!empty($content)) {
             file_put_contents($sqlInfoDir."{$db->dbName}-General-info.html", $content);
             sodUpdateProgressBar(SQL_INFO_WEIGHT);
         }
@@ -473,14 +473,14 @@ 
     text-align:left;
 }
     </style>';
-    if($getschema)
+    if ($getschema)
     {
         //BEGIN GET ALL TABLES SCHEMAS
         $all_tables = $db->getTablesArray();
 
         $contents = $style;
 
-        foreach($all_tables as $tablename){
+        foreach ($all_tables as $tablename) {
             $cols = $db->get_columns($tablename);
             $indexes = $db->get_indices($tablename);
 			//setting up table header for each file
@@ -496,7 +496,7 @@ 
 		//END UPDATING PROGRESS BAR
     }
 
-    if($getdumps)
+    if ($getdumps)
     {
 		//BEGIN GET TABLEDUMPS
 		$tableDumpsDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableDumps/");
@@ -505,7 +505,7 @@ 
 		foreach ($getDumpsFrom as $table)
 		{
 			//calling function defined above to get the string for dump
-			$contents = $style .getFullTableDump($table);
+			$contents = $style.getFullTableDump($table);
             file_put_contents($tableDumpsDir.$table.".html", $contents);
 		}
 		//END GET TABLEDUMPS
@@ -544,13 +544,13 @@ 
 
 	foreach ($beanList as $beanz)
 	{
-		if(!isset($beanFiles[$beanz]))
+		if (!isset($beanFiles[$beanz]))
 		{
 			echo "<font color=orange>NO! --- ".$beanz." is not an index in \$beanFiles</font><br>";
 		}
 		else
 		{
-			if(file_exists($beanFiles[$beanz]))
+			if (file_exists($beanFiles[$beanz]))
 				echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
 			else
 				echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
@@ -561,7 +561,7 @@ 
 	ob_clean();
 
 	$handle = sugar_fopen($cacheDir."beanFiles.html", "w");
-	if(fwrite($handle, $content) === FALSE){
+	if (fwrite($handle, $content) === FALSE) {
     	echo "Cannot write to file ".$cacheDir."beanFiles.html<br>";
     }
     fclose($handle);
@@ -589,28 +589,28 @@ 
 	global $curdatetime;
 	global $skip_md5_diff;
 	global $sod_guid;
-	if(file_exists('files.md5'))
-        include( 'files.md5');
+	if (file_exists('files.md5'))
+        include('files.md5');
 	//create dir for md5s
 	$md5_directory = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/md5/");
 
 	//skip this if the files.md5 didn't exist
-	if(!$skip_md5_diff)
+	if (!$skip_md5_diff)
 	{
 		//make sure the files.md5
-		if($filesmd5)
-			if(!copy('files.md5', $md5_directory."files.md5"))
+		if ($filesmd5)
+			if (!copy('files.md5', $md5_directory."files.md5"))
 				echo "Couldn't copy files.md5 to ".$md5_directory."<br>Skipping md5 checks.<br>";
 	}
 
 	$md5_string_calculated = generateMD5array('./');
 
-	if($md5calculated)
+	if ($md5calculated)
 		write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
 
 
 	//if the files.md5 didn't exist, we can't do this
-	if(!$skip_md5_diff)
+	if (!$skip_md5_diff)
 	{
 		$md5_string_diff = array_diff($md5_string_calculated, $md5_string);
 
@@ -638,15 +638,15 @@ 
     global $sugar_flavor;
 
     ob_start();
-    foreach ( $beanList as $beanz ) {
+    foreach ($beanList as $beanz) {
       // echo "Module: ".$beanz."<br>";
 
-	$path_parts = pathinfo( $beanFiles[ $beanz ] );
-	$vardefFileName = $path_parts[ 'dirname' ]."/vardefs.php";
-	  if( file_exists( $vardefFileName )) {
+	$path_parts = pathinfo($beanFiles[$beanz]);
+	$vardefFileName = $path_parts['dirname']."/vardefs.php";
+	  if (file_exists($vardefFileName)) {
 	    // echo "<br>".$vardefFileName."<br>";
       }
-      include_once( $vardefFileName );
+      include_once($vardefFileName);
     }
 
     echo "<html lang='en'>";
@@ -658,7 +658,7 @@ 
     echo "<style> th { text-align: left; } </style>";
 
     $tables = array();
-    foreach($dictionary as $vardef) {
+    foreach ($dictionary as $vardef) {
 	$tables[] = $vardef['table'];
 	$fields[$vardef['table']] = $vardef['fields'];
 	$comments[$vardef['table']] = $vardef['comment'];
@@ -666,9 +666,9 @@ 
 
     asort($tables);
 
-    foreach($tables as $t) {
+    foreach ($tables as $t) {
 	$name = $t;
-	if ( $name == "does_not_exist" )
+	if ($name == "does_not_exist")
 	  continue;
 	$comment = $comments[$t];
 	echo "<h2>Table: $t</h2>
@@ -682,23 +682,23 @@ 
 		<TD NOWRAP class=\"tabDetailViewDL\">Comment</TD>
 	</TR>';
 
-	ksort( $fields[ $t ] );
+	ksort($fields[$t]);
 
-	foreach($fields[$t] as $k => $v) {
+	foreach ($fields[$t] as $k => $v) {
 	  // we only care about physical tables ('source' can be 'non-db' or 'nondb' or 'function' )
-	  if ( isset( $v[ 'source' ] ))
+	  if (isset($v['source']))
 	    continue;
-	  $columnname = $v[ 'name' ];
-	  $columntype = $v[ 'type' ];
-	  $columndbtype = $v[ 'dbType' ];
-	  $columnlen = $v[ 'len' ];
-	  $columncomment = $v[ 'comment' ];
-	  $columnrequired = $v[ 'required' ];
-
-	  if ( empty( $columnlen ) ) $columnlen = '<i>n/a</i>';
-	  if ( empty( $columncomment ) ) $columncomment = '<i>(none)</i>';
-	  if ( !empty( $columndbtype ) ) $columntype = $columndbtype;
-	  if ( empty( $columnrequired ) || ( $columnrequired == false ))
+	  $columnname = $v['name'];
+	  $columntype = $v['type'];
+	  $columndbtype = $v['dbType'];
+	  $columnlen = $v['len'];
+	  $columncomment = $v['comment'];
+	  $columnrequired = $v['required'];
+
+	  if (empty($columnlen)) $columnlen = '<i>n/a</i>';
+	  if (empty($columncomment)) $columncomment = '<i>(none)</i>';
+	  if (!empty($columndbtype)) $columntype = $columndbtype;
+	  if (empty($columnrequired) || ($columnrequired == false))
 	    $columndisplayrequired = 'no';
 	  else
 	    $columndisplayrequired = 'yes';
@@ -720,7 +720,7 @@ 
     ob_clean();
 
     $handle = sugar_fopen($cacheDir."vardefschema.html", "w");
-    if(fwrite($handle, $vardefFormattedOutput) === FALSE){
+    if (fwrite($handle, $vardefFormattedOutput) === FALSE) {
       echo "Cannot write to file ".$cacheDir."vardefschema.html<br>";
     }
     fclose($handle);
@@ -728,7 +728,7 @@ 
     //END UPDATING PROGRESS BAR
 }
 
-function finishDiag(){
+function finishDiag() {
 	//BEGIN ZIP ALL FILES AND EXTRACT IN CACHE ROOT
 	global $cacheDir;
 	global $curdatetime;
@@ -768,41 +768,41 @@ 
 //BEGIN items to calculate progress bar
 $totalitems = 0;
 $totalweight = 0;
-if($doconfigphp) {$totalweight += CONFIG_WEIGHT; $totalitems++;}
-if($docustom_dir) {$totalweight += CUSTOM_DIR_WEIGHT; $totalitems++;}
-if($dophpinfo) {$totalweight += PHPINFO_WEIGHT; $totalitems++;}
-if($domysql_dumps) {$totalweight += SQL_DUMPS_WEIGHT; $totalitems++;}
-if($domysql_schema) {$totalweight += SQL_SCHEMA_WEIGHT; $totalitems++;}
-if($domysql_info) {$totalweight += SQL_INFO_WEIGHT; $totalitems++;}
-if($domd5) {$totalweight += MD5_WEIGHT; $totalitems++;}
-if($dobeanlistbeanfiles) {$totalweight += BEANLISTBEANFILES_WEIGHT; $totalitems++;}
-if($dosugarlog) {$totalweight += SUGARLOG_WEIGHT; $totalitems++;}
-if($dovardefs) {$totalweight += VARDEFS_WEIGHT; $totalitems++;}
+if ($doconfigphp) {$totalweight += CONFIG_WEIGHT; $totalitems++; }
+if ($docustom_dir) {$totalweight += CUSTOM_DIR_WEIGHT; $totalitems++; }
+if ($dophpinfo) {$totalweight += PHPINFO_WEIGHT; $totalitems++; }
+if ($domysql_dumps) {$totalweight += SQL_DUMPS_WEIGHT; $totalitems++; }
+if ($domysql_schema) {$totalweight += SQL_SCHEMA_WEIGHT; $totalitems++; }
+if ($domysql_info) {$totalweight += SQL_INFO_WEIGHT; $totalitems++; }
+if ($domd5) {$totalweight += MD5_WEIGHT; $totalitems++; }
+if ($dobeanlistbeanfiles) {$totalweight += BEANLISTBEANFILES_WEIGHT; $totalitems++; }
+if ($dosugarlog) {$totalweight += SUGARLOG_WEIGHT; $totalitems++; }
+if ($dovardefs) {$totalweight += VARDEFS_WEIGHT; $totalitems++; }
 //END items to calculate progress bar
 
 //prepare initial steps
 prepareDiag();
 
 
-if($doconfigphp)
+if ($doconfigphp)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_GETCONFPHP']."<BR>";
   executeconfigphp();
   echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
-if($docustom_dir)
+if ($docustom_dir)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_GETCUSTDIR']."<BR>";
   executecustom_dir();
   echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
-if($dophpinfo)
+if ($dophpinfo)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_GETPHPINFO']."<BR>";
   executephpinfo();
   echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
-if($domysql_info || $domysql_dumps || $domysql_schema)
+if ($domysql_info || $domysql_dumps || $domysql_schema)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_GETTING'].
                  ($domysql_info ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLINFO'] : " ").
@@ -812,25 +812,25 @@ 
   execute_sql($domysql_info, $domysql_dumps, $domysql_schema);
   echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
-if($domd5)
+if ($domd5)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_GETMD5INFO']."<BR>";
   executemd5($domd5filesmd5, $domd5calculated);
   echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
-if($dobeanlistbeanfiles)
+if ($dobeanlistbeanfiles)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_GETBEANFILES']."<BR>";
   executebeanlistbeanfiles();
   echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
-if($dosugarlog)
+if ($dosugarlog)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_GETSUGARLOG']."<BR>";
   executesugarlog();
   echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
-if($dovardefs)
+if ($dovardefs)
 {
   echo $mod_strings['LBL_DIAGNOSTIC_VARDEFS']."<BR>";
   executevardefs();

Braces +74 added lines, -50 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +49,9 @@ 
 global $current_user;
 
 
-if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
 {
     sugar_die("Unauthorized access to diagnostic tool.");
@@ -131,9 +135,9 @@ 
     global $currentitems;
 
     $currentitems++;
-    if($currentitems == $totalitems)
-      update_progress_bar("diagnostic", 100, 100);
-    else
+    if($currentitems == $totalitems) {
+          update_progress_bar("diagnostic", 100, 100);
+    } else
     {
       $progress_bar_percent += ($itemweight / $GLOBALS['totalweight'] * 100);
       update_progress_bar("diagnostic", $progress_bar_percent, 100);
@@ -214,18 +218,21 @@ 
 			//perform this check when counter is set to two, which means it is on the 'value' column
 			if($counter == 2) {
 				//if the previous "name" column value was set to smtppass, set replace_val to true
-				if(strcmp($row[$counter - 1], "smtppass") == 0  )
-					$replace_val = true;
+				if(strcmp($row[$counter - 1], "smtppass") == 0  ) {
+									$replace_val = true;
+				}
 
 				//if the previous "name" column value was set to smtppass,
 				//and the "category" value set to ldap, set replace_val to true
-				if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0)
-					$replace_val = true;
+				if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0) {
+									$replace_val = true;
+				}
 
 				//if the previous "name" column value was set to password,
 				//and the "category" value set to proxy, set replace_val to true
-				if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 )
-					$replace_val = true;
+				if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 ) {
+									$replace_val = true;
+				}
 			}
 
 			if($replace_val) {
@@ -245,8 +252,9 @@ 
 // Deletes the directory recursively
 function deleteDir($dir)
 {
-   if (substr($dir, strlen($dir)-1, 1) != '/')
-       $dir .= '/';
+   if (substr($dir, strlen($dir)-1, 1) != '/') {
+          $dir .= '/';
+   }
 
    if ($handle = opendir($dir))
    {
@@ -256,21 +264,23 @@ 
            {
                if (is_dir($dir.$obj))
                {
-                   if (!deleteDir($dir.$obj))
-                       return false;
-               }
-               elseif (is_file($dir.$obj))
+                   if (!deleteDir($dir.$obj)) {
+                                          return false;
+                   }
+               } elseif (is_file($dir.$obj))
                {
-                   if (!unlink($dir.$obj))
-                       return false;
+                   if (!unlink($dir.$obj)) {
+                                          return false;
+                   }
                }
            }
        }
 
        closedir($handle);
 
-       if (!@rmdir($dir))
-           return false;
+       if (!@rmdir($dir)) {
+                  return false;
+       }
        return true;
    }
    return false;
@@ -301,10 +311,11 @@ 
 
 
 	//determine if files.md5 exists or not
-	if(file_exists('files.md5'))
-		$skip_md5_diff = false;
-	else
-		$skip_md5_diff = true;
+	if(file_exists('files.md5')) {
+			$skip_md5_diff = false;
+	} else {
+			$skip_md5_diff = true;
+	}
 
 	// array of all tables that we need to pull rows from below
 	$getDumpsFrom = array('config' => 'config',
@@ -392,8 +403,9 @@ 
 
 
     //create directory for table definitions
-    if($getschema)
-      $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
+    if($getschema) {
+          $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
+    }
 
     //make sure they checked the box to get basic info
     if($getinfo)
@@ -547,13 +559,13 @@ 
 		if(!isset($beanFiles[$beanz]))
 		{
 			echo "<font color=orange>NO! --- ".$beanz." is not an index in \$beanFiles</font><br>";
-		}
-		else
+		} else
 		{
-			if(file_exists($beanFiles[$beanz]))
-				echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
-			else
-				echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
+			if(file_exists($beanFiles[$beanz])) {
+							echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
+			} else {
+							echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
+			}
 		}
 	}
 
@@ -589,8 +601,9 @@ 
 	global $curdatetime;
 	global $skip_md5_diff;
 	global $sod_guid;
-	if(file_exists('files.md5'))
-        include( 'files.md5');
+	if(file_exists('files.md5')) {
+	        include( 'files.md5');
+	}
 	//create dir for md5s
 	$md5_directory = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/md5/");
 
@@ -598,15 +611,17 @@ 
 	if(!$skip_md5_diff)
 	{
 		//make sure the files.md5
-		if($filesmd5)
-			if(!copy('files.md5', $md5_directory."files.md5"))
+		if($filesmd5) {
+					if(!copy('files.md5', $md5_directory."files.md5"))
 				echo "Couldn't copy files.md5 to ".$md5_directory."<br>Skipping md5 checks.<br>";
+		}
 	}
 
 	$md5_string_calculated = generateMD5array('./');
 
-	if($md5calculated)
-		write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
+	if($md5calculated) {
+			write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
+	}
 
 
 	//if the files.md5 didn't exist, we can't do this
@@ -668,8 +683,9 @@ 
 
     foreach($tables as $t) {
 	$name = $t;
-	if ( $name == "does_not_exist" )
-	  continue;
+	if ( $name == "does_not_exist" ) {
+		  continue;
+	}
 	$comment = $comments[$t];
 	echo "<h2>Table: $t</h2>
 		<p><i>{$comment}</i></p>";
@@ -686,8 +702,9 @@ 
 
 	foreach($fields[$t] as $k => $v) {
 	  // we only care about physical tables ('source' can be 'non-db' or 'nondb' or 'function' )
-	  if ( isset( $v[ 'source' ] ))
-	    continue;
+	  if ( isset( $v[ 'source' ] )) {
+	  	    continue;
+	  }
 	  $columnname = $v[ 'name' ];
 	  $columntype = $v[ 'type' ];
 	  $columndbtype = $v[ 'dbType' ];
@@ -695,13 +712,20 @@ 
 	  $columncomment = $v[ 'comment' ];
 	  $columnrequired = $v[ 'required' ];
 
-	  if ( empty( $columnlen ) ) $columnlen = '<i>n/a</i>';
-	  if ( empty( $columncomment ) ) $columncomment = '<i>(none)</i>';
-	  if ( !empty( $columndbtype ) ) $columntype = $columndbtype;
-	  if ( empty( $columnrequired ) || ( $columnrequired == false ))
-	    $columndisplayrequired = 'no';
-	  else
-	    $columndisplayrequired = 'yes';
+	  if ( empty( $columnlen ) ) {
+	      $columnlen = '<i>n/a</i>';
+	  }
+	  if ( empty( $columncomment ) ) {
+	      $columncomment = '<i>(none)</i>';
+	  }
+	  if ( !empty( $columndbtype ) ) {
+	      $columntype = $columndbtype;
+	  }
+	  if ( empty( $columnrequired ) || ( $columnrequired == false )) {
+	  	    $columndisplayrequired = 'no';
+	  } else {
+	  	    $columndisplayrequired = 'yes';
+	  }
 
 	  echo '<TR BGCOLOR="#FFFFFF" ALIGN=left>
 			<TD ALIGN=left class=\"tabDetailViewDF\">'.$columnname.'</TD>

modules/Administration/RepairSeedUsers.php

Indentation +23 added lines, -23 removed lines

@@ -42,27 +42,27 @@ 
 
 if(is_admin($current_user)){
     if(count($_POST)){
-    	if(!empty($_POST['activate'])){
+        if(!empty($_POST['activate'])){
 
-    		$status = '';
-    		if($_POST['activate'] == 'false'){
-    			$status = 'Inactive';
-    		}else{
-    			$status = 'Active';
-    		}
-    	}
-    	$query = "UPDATE users SET status = '$status' WHERE id LIKE 'seed%'";
-   		$GLOBALS['db']->query($query);
+            $status = '';
+            if($_POST['activate'] == 'false'){
+                $status = 'Inactive';
+            }else{
+                $status = 'Active';
+            }
+        }
+        $query = "UPDATE users SET status = '$status' WHERE id LIKE 'seed%'";
+            $GLOBALS['db']->query($query);
     }
-    	$query = "SELECT status FROM users WHERE id LIKE 'seed%'";
-    	$result = $GLOBALS['db']->query($query);
-		$row = $GLOBALS['db']->fetchByAssoc($result);
-		if(!empty($row['status'])){
-			$activate = 'false';
-			if($row['status'] == 'Inactive'){
-				$activate = 'true';
-			}
-			?>
+        $query = "SELECT status FROM users WHERE id LIKE 'seed%'";
+        $result = $GLOBALS['db']->query($query);
+        $row = $GLOBALS['db']->fetchByAssoc($result);
+        if(!empty($row['status'])){
+            $activate = 'false';
+            if($row['status'] == 'Inactive'){
+                $activate = 'true';
+            }
+            ?>
 				<p>
 				<form name="RepairSeedUsers" method="post" action="index.php">
 				<input type="hidden" name="module" value="Administration">
@@ -80,11 +80,11 @@ 
 				</p>
 			<?php
 
-		}else{
-			echo 'No seed Users';
-		}
+        }else{
+            echo 'No seed Users';
+        }
 }
 else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,14 +40,14 @@ 
 
 global $current_user;
 
-if(is_admin($current_user)){
-    if(count($_POST)){
-    	if(!empty($_POST['activate'])){
+if (is_admin($current_user)) {
+    if (count($_POST)) {
+    	if (!empty($_POST['activate'])) {
 
     		$status = '';
-    		if($_POST['activate'] == 'false'){
+    		if ($_POST['activate'] == 'false') {
     			$status = 'Inactive';
-    		}else{
+    		} else {
     			$status = 'Active';
     		}
     	}
@@ -57,9 +57,9 @@ 
     	$query = "SELECT status FROM users WHERE id LIKE 'seed%'";
     	$result = $GLOBALS['db']->query($query);
 		$row = $GLOBALS['db']->fetchByAssoc($result);
-		if(!empty($row['status'])){
+		if (!empty($row['status'])) {
 			$activate = 'false';
-			if($row['status'] == 'Inactive'){
+			if ($row['status'] == 'Inactive') {
 				$activate = 'true';
 			}
 			?>
@@ -73,18 +73,18 @@ 
 				<table cellspacing="{CELLSPACING}" class="otherview">
 					<tr>
 					    <td scope="row" width="30%"><?php echo $mod_strings['LBL_REPAIR_SEED_USERS_TITLE']; ?></td>
-					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];}else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
+					    <td><input type="submit" name="button" value="<?php if ($row['status'] == 'Inactive') {echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE']; } else {echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE']; } ?>"></td>
 					</tr>
 				</table>
 				</form>
 				</p>
 			<?php
 
-		}else{
+		} else {
 			echo 'No seed Users';
 		}
 }
-else{
+else {
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

Braces +7 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +49,7 @@ 
     		$status = '';
     		if($_POST['activate'] == 'false'){
     			$status = 'Inactive';
-    		}else{
+    		} else{
     			$status = 'Active';
     		}
     	}
@@ -73,18 +75,17 @@ 
 				<table cellspacing="{CELLSPACING}" class="otherview">
 					<tr>
 					    <td scope="row" width="30%"><?php echo $mod_strings['LBL_REPAIR_SEED_USERS_TITLE']; ?></td>
-					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];}else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
+					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];} else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
 					</tr>
 				</table>
 				</form>
 				</p>
 			<?php
 
-		}else{
+		} else{
 			echo 'No seed Users';
 		}
-}
-else{
+} else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

modules/Administration/RebuildSchedulers.php

Indentation +3 added lines, -3 removed lines

@@ -42,9 +42,9 @@
 
 if(isset($_REQUEST['perform_rebuild']) && $_REQUEST['perform_rebuild'] == 'true') {
 	
-	require_once('install/install_utils.php');
-	$focus = new Scheduler();
-	$focus->rebuildDefaultSchedulers();
+    require_once('install/install_utils.php');
+    $focus = new Scheduler();
+    $focus->rebuildDefaultSchedulers();
 	
 $admin_mod_strings = return_module_language($current_language, 'Administration');	
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,7 +40,7 @@ 
 
 echo getClassicModuleTitle('Administration', array($mod_strings['LBL_REBUILD_SCHEDULERS_TITLE']), false);
 
-if(isset($_REQUEST['perform_rebuild']) && $_REQUEST['perform_rebuild'] == 'true') {
+if (isset($_REQUEST['perform_rebuild']) && $_REQUEST['perform_rebuild'] == 'true') {
 	
 	require_once('install/install_utils.php');
 	$focus = new Scheduler();

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Administration/updater_utils.php

Indentation +211 added lines, -211 removed lines

@@ -44,18 +44,18 @@ 
 require_once('include/utils/encryption_utils.php');
 
 function getSystemInfo($send_usage_info=true){
-	global $sugar_config;
-	global $db, $administration, $timedate;
-	$info=array();
-	$info = getBaseSystemInfo($send_usage_info);
+    global $sugar_config;
+    global $db, $administration, $timedate;
+    $info=array();
+    $info = getBaseSystemInfo($send_usage_info);
     if($send_usage_info){
-		$info['application_key']=$sugar_config['unique_key'];
-		$info['php_version']=phpversion();
-		if(isset($_SERVER['SERVER_SOFTWARE'])) {
-			$info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
-		} // if
+        $info['application_key']=$sugar_config['unique_key'];
+        $info['php_version']=phpversion();
+        if(isset($_SERVER['SERVER_SOFTWARE'])) {
+            $info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
+        } // if
 
-		//get user count.
+        //get user count.
 
                 $query = "SELECT count(*) as total from users WHERE " . User::getLicensedUsersWhere();
                 $result = $db->getOne($query, false, 'fetching active users count');
@@ -63,58 +63,58 @@ 
                     $info['users'] = $result;
                 }
 
-		if(empty($administration)){
+        if(empty($administration)){
 
-			$administration = new Administration();
-		}
-		$administration->retrieveSettings('system');
-		$info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
+            $administration = new Administration();
+        }
+        $administration->retrieveSettings('system');
+        $info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
 
 
-		$result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
-		if($result !== false) {
-			$info['admin_users'] = $result;
-		}
+        $result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
+        if($result !== false) {
+            $info['admin_users'] = $result;
+        }
 
 
-		$result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
-		if($result !== false) {
-			$info['registered_users'] = $result;
-		}
+        $result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
+        if($result !== false) {
+            $info['registered_users'] = $result;
+        }
 
-		$lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
-		if( !$send_usage_info) {
-			$info['users_active_30_days'] = -1;
-		} else {
-			$info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
-		}
+        $lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
+        if( !$send_usage_info) {
+            $info['users_active_30_days'] = -1;
+        } else {
+            $info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
+        }
 
 
 
 
-		if(!$send_usage_info){
-			$info['latest_tracker_id'] = -1;
-		}else{
-			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
-			    $info['latest_tracker_id'] = $id;
-		}
+        if(!$send_usage_info){
+            $info['latest_tracker_id'] = -1;
+        }else{
+            $id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
+            if ( $id !== false )
+                $info['latest_tracker_id'] = $id;
+        }
 
-		$info['db_type']=$sugar_config['dbconfig']['db_type'];
-		$info['db_version']=$db->version();
-	}
-	if(file_exists('distro.php')){
-		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
-	}
-	$info['os'] = php_uname('s');
-	$info['os_version'] = php_uname('r');
-	$info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
-	$info['timezone'] = date('e');
-	if($info['timezone'] == 'e'){
-		$info['timezone'] = date('T');
-	}
-	return $info;
+        $info['db_type']=$sugar_config['dbconfig']['db_type'];
+        $info['db_version']=$db->version();
+    }
+    if(file_exists('distro.php')){
+        include('distro.php');
+        if(!empty($distro_name))$info['distro_name'] = $distro_name;
+    }
+    $info['os'] = php_uname('s');
+    $info['os_version'] = php_uname('r');
+    $info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
+    $info['timezone'] = date('e');
+    if($info['timezone'] == 'e'){
+        $info['timezone'] = date('T');
+    }
+    return $info;
 
 }
 
@@ -137,28 +137,28 @@ 
 }
 
 function check_now($send_usage_info=true, $get_request_data=false, $response_data = false, $from_install=false ) {
-	global $sugar_config, $timedate;
-	global $db, $license;
+    global $sugar_config, $timedate;
+    global $db, $license;
     include('sugar_version.php');
 
 
-	$return_array=array();
+    $return_array=array();
     if(!$from_install && empty($license))loadLicense(true);
 
-	if(!$response_data){
+    if(!$response_data){
 
         if($from_install){
-    		$info = getBaseSystemInfo(false);
+            $info = getBaseSystemInfo(false);
 
         }else{
             $info = getSystemInfo($send_usage_info);
         }
 
-		require_once('include/nusoap/nusoap.php');
+        require_once('include/nusoap/nusoap.php');
 
-		$GLOBALS['log']->debug('USING HTTPS TO CONNECT TO HEARTBEAT');
-		$sclient = new nusoapclient('https://updates.sugarcrm.com/heartbeat/soap.php', false, false, false, false, false, 15, 15);
-		$ping = $sclient->call('sugarPing', array());
+        $GLOBALS['log']->debug('USING HTTPS TO CONNECT TO HEARTBEAT');
+        $sclient = new nusoapclient('https://updates.sugarcrm.com/heartbeat/soap.php', false, false, false, false, false, 15, 15);
+        $ping = $sclient->call('sugarPing', array());
         if (empty($ping) || $sclient->getError()) {
             if (!$get_request_data) {
                 return array(
@@ -171,92 +171,92 @@ 
         }
 
 
-			$key = '4829482749329';
-
-
-
-		$encoded = sugarEncode($key, serialize($info));
-
-		if($get_request_data){
-			$request_data = array('key'=>$key, 'data'=>$encoded);
-			return serialize($request_data);
-		}
-		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
-
-	}else{
-		$encodedResult = 	$response_data['data'];
-		$key = $response_data['key'];
-
-	}
-
-	if($response_data || !$sclient->getError()){
-		$serializedResultData = sugarDecode($key,$encodedResult);
-		$resultData = unserialize($serializedResultData);
-		if($response_data && empty($resultData))
-		{
-			$resultData = array();
-			$resultData['validation'] = 'invalid validation key';
-		}
-	}else
-	{
-		$resultData = array();
-		$resultData['versions'] = array();
-
-	}
-
-	if($response_data || !$sclient->getError() )
-	{
-		if(!empty($resultData['msg'])){
-			if(!empty($resultData['msg']['admin'])){
-				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
-				$license->saveSetting('license', 'msg_admin','');
-			}
-			if(!empty($resultData['msg']['all'])){
-				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
-				$license->saveSetting('license', 'msg_all','');
-			}
-		}else{
-			$license->saveSetting('license', 'msg_admin','');
-			$license->saveSetting('license', 'msg_all','');
-		}
-		$license->saveSetting('license', 'last_validation', 'success');
-		unset($_SESSION['COULD_NOT_CONNECT']);
-	}
-	else
-	{
-		$resultData = array();
-		$resultData['versions'] = array();
-
-		$license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
-		$license->saveSetting('license', 'last_validation', 'no_connection');
-
-		if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
-			$license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
-
-			$license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
-		}
-		$_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
-
-	}
-	if(!empty($resultData['versions'])){
-
-		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
-		$resultData['versions'] = array();
-		$license->saveSetting('license', 'latest_versions','')	;
-	}
-
-	if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
+            $key = '4829482749329';
+
+
+
+        $encoded = sugarEncode($key, serialize($info));
+
+        if($get_request_data){
+            $request_data = array('key'=>$key, 'data'=>$encoded);
+            return serialize($request_data);
+        }
+        $encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
+
+    }else{
+        $encodedResult = 	$response_data['data'];
+        $key = $response_data['key'];
+
+    }
+
+    if($response_data || !$sclient->getError()){
+        $serializedResultData = sugarDecode($key,$encodedResult);
+        $resultData = unserialize($serializedResultData);
+        if($response_data && empty($resultData))
+        {
+            $resultData = array();
+            $resultData['validation'] = 'invalid validation key';
+        }
+    }else
+    {
+        $resultData = array();
+        $resultData['versions'] = array();
+
+    }
+
+    if($response_data || !$sclient->getError() )
+    {
+        if(!empty($resultData['msg'])){
+            if(!empty($resultData['msg']['admin'])){
+                $license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
+            }else{
+                $license->saveSetting('license', 'msg_admin','');
+            }
+            if(!empty($resultData['msg']['all'])){
+                $license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
+            }else{
+                $license->saveSetting('license', 'msg_all','');
+            }
+        }else{
+            $license->saveSetting('license', 'msg_admin','');
+            $license->saveSetting('license', 'msg_all','');
+        }
+        $license->saveSetting('license', 'last_validation', 'success');
+        unset($_SESSION['COULD_NOT_CONNECT']);
+    }
+    else
+    {
+        $resultData = array();
+        $resultData['versions'] = array();
+
+        $license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
+        $license->saveSetting('license', 'last_validation', 'no_connection');
+
+        if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
+            $license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
+
+            $license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
+        }
+        $_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
+
+    }
+    if(!empty($resultData['versions'])){
+
+        $license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
+    }else{
+        $resultData['versions'] = array();
+        $license->saveSetting('license', 'latest_versions','')	;
+    }
+
+    if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
         && compareVersions($sugar_version, $resultData['versions'][0]['version']))
-	{
-		$resultData['versions'][0]['version'] = $sugar_version;
-		$resultData['versions'][0]['description'] = "You have the latest version.";
-	}
+    {
+        $resultData['versions'][0]['version'] = $sugar_version;
+        $resultData['versions'][0]['description'] = "You have the latest version.";
+    }
 
 
-	return $resultData['versions'];
+    return $resultData['versions'];
 }
 /*
  * returns true if $ver1 > $ver2
@@ -268,126 +268,126 @@ 
 function set_CheckUpdates_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','CheckUpdates',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','CheckUpdates',$value);
 }
 /* return's value for the 'CheckUpdates' config setting
 * if the setting does not exist one gets created with a default value of automatic.
 */
 function get_CheckUpdates_config_setting() {
 
-	$checkupdates='automatic';
+    $checkupdates='automatic';
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update',true);
-	if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
-		$admin->saveSetting('Update','CheckUpdates','automatic');
-	} else {
-		$checkupdates=$admin->settings['Update_CheckUpdates'];
-	}
-	return $checkupdates;
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update',true);
+    if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
+        $admin->saveSetting('Update','CheckUpdates','automatic');
+    } else {
+        $checkupdates=$admin->settings['Update_CheckUpdates'];
+    }
+    return $checkupdates;
 }
 
 function set_last_check_version_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_version',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','last_check_version',$value);
 }
 function get_last_check_version_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
-	if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
-		return null;
-	} else {
-		return $admin->settings['Update_last_check_version'];
-	}
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update');
+    if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
+        return null;
+    } else {
+        return $admin->settings['Update_last_check_version'];
+    }
 }
 
 
 function set_last_check_date_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_date',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','last_check_date',$value);
 }
 function get_last_check_date_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
-	if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
-		return 0;
-	} else {
-		return $admin->settings['Update_last_check_date'];
-	}
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update');
+    if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
+        return 0;
+    } else {
+        return $admin->settings['Update_last_check_date'];
+    }
 }
 
 function set_sugarbeat($value) {
-	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
-	$sugar_config[$_SUGARBEAT] = $value;
-	write_array_to_file( "sugar_config", $sugar_config, "config.php" );
+    global $sugar_config;
+    $_SUGARBEAT="sugarbeet";
+    $sugar_config[$_SUGARBEAT] = $value;
+    write_array_to_file( "sugar_config", $sugar_config, "config.php" );
 }
 function get_sugarbeat() {
 
 
-	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
+    global $sugar_config;
+    $_SUGARBEAT="sugarbeet";
 
-	if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
-	return false;
-	}
-	return true;
+    if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
+    return false;
+    }
+    return true;
 
 }
 
 
 
 function shouldCheckSugar(){
-	global $license, $timedate;
-	if(
+    global $license, $timedate;
+    if(
 
-	get_CheckUpdates_config_setting() == 'automatic' ){
-		return true;
-	}
+    get_CheckUpdates_config_setting() == 'automatic' ){
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 
 
 function loadLicense($firstLogin=false){
 
-	$GLOBALS['license']=new Administration();
-	$GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
+    $GLOBALS['license']=new Administration();
+    $GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
 
 }
 
 function loginLicense(){
-	global $current_user, $license;
-	loadLicense(true);
+    global $current_user, $license;
+    loadLicense(true);
 
 
-	if (shouldCheckSugar()) {
+    if (shouldCheckSugar()) {
 
 
-		$last_check_date=get_last_check_date_config_setting();
-		$current_date_time=time();
-		$time_period=3*23*3600 ;
-		if (($current_date_time - $last_check_date) > $time_period
-		) {
-			$version = check_now(get_sugarbeat());
+        $last_check_date=get_last_check_date_config_setting();
+        $current_date_time=time();
+        $time_period=3*23*3600 ;
+        if (($current_date_time - $last_check_date) > $time_period
+        ) {
+            $version = check_now(get_sugarbeat());
 
-			unset($_SESSION['license_seats_needed']);
-			loadLicense();
-			set_last_check_date_config_setting("$current_date_time");
-			include('sugar_version.php');
+            unset($_SESSION['license_seats_needed']);
+            loadLicense();
+            set_last_check_date_config_setting("$current_date_time");
+            include('sugar_version.php');
 
             $newVersion = '';
             if (!empty($version) && count($version) == 1)
@@ -396,14 +396,14 @@ 
             }
 
             if (version_compare($newVersion, $sugar_version, '>') && is_admin($current_user))
-			{
-				//set session variables.
-				$_SESSION['available_version']=$version[0]['version'];
-				$_SESSION['available_version_description']=$version[0]['description'];
-				set_last_check_version_config_setting($version[0]['version']);
-			}
-		}
-	}
+            {
+                //set session variables.
+                $_SESSION['available_version']=$version[0]['version'];
+                $_SESSION['available_version_description']=$version[0]['description'];
+                set_last_check_version_config_setting($version[0]['version']);
+            }
+        }
+    }
 
 
 }

Braces +21 added lines, -15 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -94,10 +96,11 @@ 
 
 		if(!$send_usage_info){
 			$info['latest_tracker_id'] = -1;
-		}else{
+		} else{
 			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
-			    $info['latest_tracker_id'] = $id;
+			if ( $id !== false ) {
+						    $info['latest_tracker_id'] = $id;
+			}
 		}
 
 		$info['db_type']=$sugar_config['dbconfig']['db_type'];
@@ -105,7 +108,9 @@ 
 	}
 	if(file_exists('distro.php')){
 		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
+		if(!empty($distro_name)) {
+		    $info['distro_name'] = $distro_name;
+		}
 	}
 	$info['os'] = php_uname('s');
 	$info['os_version'] = php_uname('r');
@@ -143,14 +148,16 @@ 
 
 
 	$return_array=array();
-    if(!$from_install && empty($license))loadLicense(true);
+    if(!$from_install && empty($license)) {
+        loadLicense(true);
+    }
 
 	if(!$response_data){
 
         if($from_install){
     		$info = getBaseSystemInfo(false);
 
-        }else{
+        } else{
             $info = getSystemInfo($send_usage_info);
         }
 
@@ -183,7 +190,7 @@ 
 		}
 		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
 
-	}else{
+	} else{
 		$encodedResult = 	$response_data['data'];
 		$key = $response_data['key'];
 
@@ -197,7 +204,7 @@ 
 			$resultData = array();
 			$resultData['validation'] = 'invalid validation key';
 		}
-	}else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -209,22 +216,21 @@ 
 		if(!empty($resultData['msg'])){
 			if(!empty($resultData['msg']['admin'])){
 				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_admin','');
 			}
 			if(!empty($resultData['msg']['all'])){
 				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_all','');
 			}
-		}else{
+		} else{
 			$license->saveSetting('license', 'msg_admin','');
 			$license->saveSetting('license', 'msg_all','');
 		}
 		$license->saveSetting('license', 'last_validation', 'success');
 		unset($_SESSION['COULD_NOT_CONNECT']);
-	}
-	else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -243,7 +249,7 @@ 
 	if(!empty($resultData['versions'])){
 
 		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
+	} else{
 		$resultData['versions'] = array();
 		$license->saveSetting('license', 'latest_versions','')	;
 	}

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,47 +43,47 @@ 
 ********************************************************************************/
 require_once('include/utils/encryption_utils.php');
 
-function getSystemInfo($send_usage_info=true){
+function getSystemInfo($send_usage_info = true) {
 	global $sugar_config;
 	global $db, $administration, $timedate;
-	$info=array();
+	$info = array();
 	$info = getBaseSystemInfo($send_usage_info);
-    if($send_usage_info){
-		$info['application_key']=$sugar_config['unique_key'];
-		$info['php_version']=phpversion();
-		if(isset($_SERVER['SERVER_SOFTWARE'])) {
+    if ($send_usage_info) {
+		$info['application_key'] = $sugar_config['unique_key'];
+		$info['php_version'] = phpversion();
+		if (isset($_SERVER['SERVER_SOFTWARE'])) {
 			$info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
 		} // if
 
 		//get user count.
 
-                $query = "SELECT count(*) as total from users WHERE " . User::getLicensedUsersWhere();
+                $query = "SELECT count(*) as total from users WHERE ".User::getLicensedUsersWhere();
                 $result = $db->getOne($query, false, 'fetching active users count');
                 if ($result !== false) {
                     $info['users'] = $result;
                 }
 
-		if(empty($administration)){
+		if (empty($administration)) {
 
 			$administration = new Administration();
 		}
 		$administration->retrieveSettings('system');
-		$info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
+		$info['system_name'] = (!empty($administration->settings['system_name'])) ?substr($administration->settings['system_name'], 0, 255) : '';
 
 
-		$result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
-		if($result !== false) {
+		$result = $db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
+		if ($result !== false) {
 			$info['admin_users'] = $result;
 		}
 
 
-		$result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
-		if($result !== false) {
+		$result = $db->getOne("select count(*) count from users", false, 'fetching all users count');
+		if ($result !== false) {
 			$info['registered_users'] = $result;
 		}
 
-		$lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
-		if( !$send_usage_info) {
+		$lastMonth = $db->convert("'".$timedate->getNow()->modify("-30 days")->asDb(false)."'", 'datetime');
+		if (!$send_usage_info) {
 			$info['users_active_30_days'] = -1;
 		} else {
 			$info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
@@ -92,41 +92,41 @@ 
 
 
 
-		if(!$send_usage_info){
+		if (!$send_usage_info) {
 			$info['latest_tracker_id'] = -1;
-		}else{
-			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
+		} else {
+			$id = $db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
+			if ($id !== false)
 			    $info['latest_tracker_id'] = $id;
 		}
 
-		$info['db_type']=$sugar_config['dbconfig']['db_type'];
-		$info['db_version']=$db->version();
+		$info['db_type'] = $sugar_config['dbconfig']['db_type'];
+		$info['db_version'] = $db->version();
 	}
-	if(file_exists('distro.php')){
+	if (file_exists('distro.php')) {
 		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
+		if (!empty($distro_name))$info['distro_name'] = $distro_name;
 	}
 	$info['os'] = php_uname('s');
 	$info['os_version'] = php_uname('r');
 	$info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
 	$info['timezone'] = date('e');
-	if($info['timezone'] == 'e'){
+	if ($info['timezone'] == 'e') {
 		$info['timezone'] = date('T');
 	}
 	return $info;
 
 }
 
-function getBaseSystemInfo($send_usage_info=true){
+function getBaseSystemInfo($send_usage_info = true) {
     include('sugar_version.php');
-    $info=array();
+    $info = array();
 
-    if($send_usage_info){
-        $info['sugar_db_version']=$sugar_db_version;
+    if ($send_usage_info) {
+        $info['sugar_db_version'] = $sugar_db_version;
     }
-    $info['sugar_version']=$sugar_version;
-    $info['sugar_flavor']=$sugar_flavor;
+    $info['sugar_version'] = $sugar_version;
+    $info['sugar_flavor'] = $sugar_flavor;
     $info['auth_level'] = 0;
 
 
@@ -136,21 +136,21 @@ 
 
 }
 
-function check_now($send_usage_info=true, $get_request_data=false, $response_data = false, $from_install=false ) {
+function check_now($send_usage_info = true, $get_request_data = false, $response_data = false, $from_install = false) {
 	global $sugar_config, $timedate;
 	global $db, $license;
     include('sugar_version.php');
 
 
-	$return_array=array();
-    if(!$from_install && empty($license))loadLicense(true);
+	$return_array = array();
+    if (!$from_install && empty($license))loadLicense(true);
 
-	if(!$response_data){
+	if (!$response_data) {
 
-        if($from_install){
+        if ($from_install) {
     		$info = getBaseSystemInfo(false);
 
-        }else{
+        } else {
             $info = getSystemInfo($send_usage_info);
         }
 
@@ -177,49 +177,49 @@ 
 
 		$encoded = sugarEncode($key, serialize($info));
 
-		if($get_request_data){
+		if ($get_request_data) {
 			$request_data = array('key'=>$key, 'data'=>$encoded);
 			return serialize($request_data);
 		}
 		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
 
-	}else{
-		$encodedResult = 	$response_data['data'];
+	} else {
+		$encodedResult = $response_data['data'];
 		$key = $response_data['key'];
 
 	}
 
-	if($response_data || !$sclient->getError()){
-		$serializedResultData = sugarDecode($key,$encodedResult);
+	if ($response_data || !$sclient->getError()) {
+		$serializedResultData = sugarDecode($key, $encodedResult);
 		$resultData = unserialize($serializedResultData);
-		if($response_data && empty($resultData))
+		if ($response_data && empty($resultData))
 		{
 			$resultData = array();
 			$resultData['validation'] = 'invalid validation key';
 		}
-	}else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
 
 	}
 
-	if($response_data || !$sclient->getError() )
+	if ($response_data || !$sclient->getError())
 	{
-		if(!empty($resultData['msg'])){
-			if(!empty($resultData['msg']['admin'])){
+		if (!empty($resultData['msg'])) {
+			if (!empty($resultData['msg']['admin'])) {
 				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
-				$license->saveSetting('license', 'msg_admin','');
+			} else {
+				$license->saveSetting('license', 'msg_admin', '');
 			}
-			if(!empty($resultData['msg']['all'])){
+			if (!empty($resultData['msg']['all'])) {
 				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
-				$license->saveSetting('license', 'msg_all','');
+			} else {
+				$license->saveSetting('license', 'msg_all', '');
 			}
-		}else{
-			$license->saveSetting('license', 'msg_admin','');
-			$license->saveSetting('license', 'msg_all','');
+		} else {
+			$license->saveSetting('license', 'msg_admin', '');
+			$license->saveSetting('license', 'msg_all', '');
 		}
 		$license->saveSetting('license', 'last_validation', 'success');
 		unset($_SESSION['COULD_NOT_CONNECT']);
@@ -232,23 +232,23 @@ 
 		$license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
 		$license->saveSetting('license', 'last_validation', 'no_connection');
 
-		if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
+		if (empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])) {
 			$license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
 
 			$license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
 		}
-		$_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
+		$_SESSION['COULD_NOT_CONNECT'] = TimeDate::getInstance()->nowDb();
 
 	}
-	if(!empty($resultData['versions'])){
+	if (!empty($resultData['versions'])) {
 
-		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
+		$license->saveSetting('license', 'latest_versions', base64_encode(serialize($resultData['versions'])));
+	} else {
 		$resultData['versions'] = array();
-		$license->saveSetting('license', 'latest_versions','')	;
+		$license->saveSetting('license', 'latest_versions', '');
 	}
 
-	if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
+	if (sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
         && compareVersions($sugar_version, $resultData['versions'][0]['version']))
 	{
 		$resultData['versions'][0]['version'] = $sugar_version;
@@ -268,23 +268,23 @@ 
 function set_CheckUpdates_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','CheckUpdates',$value);
+	$admin = new Administration();
+	$admin->saveSetting('Update', 'CheckUpdates', $value);
 }
 /* return's value for the 'CheckUpdates' config setting
 * if the setting does not exist one gets created with a default value of automatic.
 */
 function get_CheckUpdates_config_setting() {
 
-	$checkupdates='automatic';
+	$checkupdates = 'automatic';
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update',true);
+	$admin = new Administration();
+	$admin = $admin->retrieveSettings('Update', true);
 	if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
-		$admin->saveSetting('Update','CheckUpdates','automatic');
+		$admin->saveSetting('Update', 'CheckUpdates', 'automatic');
 	} else {
-		$checkupdates=$admin->settings['Update_CheckUpdates'];
+		$checkupdates = $admin->settings['Update_CheckUpdates'];
 	}
 	return $checkupdates;
 }
@@ -292,15 +292,15 @@ 
 function set_last_check_version_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_version',$value);
+	$admin = new Administration();
+	$admin->saveSetting('Update', 'last_check_version', $value);
 }
 function get_last_check_version_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
+	$admin = new Administration();
+	$admin = $admin->retrieveSettings('Update');
 	if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
 		return null;
 	} else {
@@ -312,15 +312,15 @@ 
 function set_last_check_date_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_date',$value);
+	$admin = new Administration();
+	$admin->saveSetting('Update', 'last_check_date', $value);
 }
 function get_last_check_date_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
+	$admin = new Administration();
+	$admin = $admin->retrieveSettings('Update');
 	if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
 		return 0;
 	} else {
@@ -330,15 +330,15 @@ 
 
 function set_sugarbeat($value) {
 	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
+	$_SUGARBEAT = "sugarbeet";
 	$sugar_config[$_SUGARBEAT] = $value;
-	write_array_to_file( "sugar_config", $sugar_config, "config.php" );
+	write_array_to_file("sugar_config", $sugar_config, "config.php");
 }
 function get_sugarbeat() {
 
 
 	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
+	$_SUGARBEAT = "sugarbeet";
 
 	if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
 	return false;
@@ -349,11 +349,11 @@ 
 
 
 
-function shouldCheckSugar(){
+function shouldCheckSugar() {
 	global $license, $timedate;
-	if(
+	if (
 
-	get_CheckUpdates_config_setting() == 'automatic' ){
+	get_CheckUpdates_config_setting() == 'automatic' ) {
 		return true;
 	}
 
@@ -362,14 +362,14 @@ 
 
 
 
-function loadLicense($firstLogin=false){
+function loadLicense($firstLogin = false) {
 
-	$GLOBALS['license']=new Administration();
-	$GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
+	$GLOBALS['license'] = new Administration();
+	$GLOBALS['license'] = $GLOBALS['license']->retrieveSettings('license', $firstLogin);
 
 }
 
-function loginLicense(){
+function loginLicense() {
 	global $current_user, $license;
 	loadLicense(true);
 
@@ -377,9 +377,9 @@ 
 	if (shouldCheckSugar()) {
 
 
-		$last_check_date=get_last_check_date_config_setting();
-		$current_date_time=time();
-		$time_period=3*23*3600 ;
+		$last_check_date = get_last_check_date_config_setting();
+		$current_date_time = time();
+		$time_period = 3 * 23 * 3600;
 		if (($current_date_time - $last_check_date) > $time_period
 		) {
 			$version = check_now(get_sugarbeat());
@@ -398,8 +398,8 @@ 
             if (version_compare($newVersion, $sugar_version, '>') && is_admin($current_user))
 			{
 				//set session variables.
-				$_SESSION['available_version']=$version[0]['version'];
-				$_SESSION['available_version_description']=$version[0]['description'];
+				$_SESSION['available_version'] = $version[0]['version'];
+				$_SESSION['available_version_description'] = $version[0]['description'];
 				set_last_check_version_config_setting($version[0]['version']);
 			}
 		}

modules/Administration/DiagnosticDownload.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 if(!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
 {
-	die('Did not receive a filename to download');
+    die('Did not receive a filename to download');
 }
 $time = str_replace(array('.', '/', '\\'), '', $_REQUEST['time']);
 $guid = str_replace(array('.', '/', '\\'), '', $_REQUEST['guid']);

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,7 +48,7 @@ 
     sugar_die("Unauthorized access to diagnostic tool.");
 }
 
-if(!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
+if (!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
 {
 	die('Did not receive a filename to download');
 }

Braces +6 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +44,9 @@ 
 global $current_user;
 
 
-if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
 {
     sugar_die("Unauthorized access to diagnostic tool.");

modules/Administration/expandDatabase.php

Indentation +76 added lines, -76 removed lines

@@ -40,38 +40,38 @@ 
 
 $db = DBManagerFactory::getInstance();
 if(!$db->supports('fix:expandDatabase')) {
-	echo "<BR>";
-	echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
-	echo "<BR>";
-	sugar_die('');
+    echo "<BR>";
+    echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
+    echo "<BR>";
+    sugar_die('');
 }
 global $current_user,$beanFiles;
 
 set_time_limit(3600);
 if(is_admin($current_user) || isset($from_sync_client)){
 
-	$execute = false;
-	$export = false;
-
-
-	if(isset($_REQUEST['do_action'])){
-		switch($_REQUEST['do_action']){
-			case 'display':
-				break;
-			case 'execute':
-				$execute = true;
-				break;
-			case 'export':
-				header('Location: index.php?module=Administration&action=expandDatabase&do_action=do_export&to_pdf=true');
-				die();
-			case 'do_export':
-				$export = true;
-				break;
-		}
-
-		if(!$export && empty($_REQUEST['repair_silent'])){
-			echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
-		}
+    $execute = false;
+    $export = false;
+
+
+    if(isset($_REQUEST['do_action'])){
+        switch($_REQUEST['do_action']){
+            case 'display':
+                break;
+            case 'execute':
+                $execute = true;
+                break;
+            case 'export':
+                header('Location: index.php?module=Administration&action=expandDatabase&do_action=do_export&to_pdf=true');
+                die();
+            case 'do_export':
+                $export = true;
+                break;
+        }
+
+        if(!$export && empty($_REQUEST['repair_silent'])){
+            echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
+        }
 
         $alter_queries = array();
         $restore_quries = array();
@@ -88,60 +88,60 @@ 
         $theRestoreQueries = '';
         $alter_queries = array();
         while ($row = $db->fetchByAssoc($result)) {
-   	      $length = (int)$row['length'];
-   	      if($length < 255) {
-   	         $newLength = ($length * 3 < 255) ? $length * 3 : 255;
-   	         $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
-             $theAlterQueries .= $sql . "\n";
-             $alter_queries[] = $sql;
-
-             $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
-             $theRestoreQueries .= $sql2 . "\n";
-          }
+                $length = (int)$row['length'];
+                if($length < 255) {
+                $newLength = ($length * 3 < 255) ? $length * 3 : 255;
+                $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
+                $theAlterQueries .= $sql . "\n";
+                $alter_queries[] = $sql;
+
+                $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
+                $theRestoreQueries .= $sql2 . "\n";
+            }
         } //while
 
         //If there are no ALTER queries to run, echo message
         if(count($alter_queries) == 0) {
-           echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
+            echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
         } else {
 
-	        // Create a backup file to restore columns to original length
-	        if($execute) {
-	           $fh = sugar_fopen('restoreExpand.sql', 'w');
-	           if(-1 == fwrite($fh, $theRestoreQueries)) {
-	           	  $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
-	           	  echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
-	           } else {
-	           	  $GLOBALS['log']->info($mod_strings['LBL_CREATE_RESOTRE_FILE']);
-	           	  echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
-	           }
-
-	           foreach($alter_queries as $key=>$value) {
-	           	       $db->query($value);
-	           }
-	        }
-
-			if($export) {
-		   		header("Content-Disposition: attachment; filename=expandSugarDB.sql");
-				header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
-				header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-				header( "Last-Modified: " . TimeDate::httpTime() );
-				header( "Cache-Control: post-check=0, pre-check=0", false );
-				header("Content-Length: ".strlen($theAlterQueries));
-		   		echo $theAlterQueries;
-		   		die();
-			} else {
-				if(empty($_REQUEST['repair_silent'])) {
-					echo nl2br($theAlterQueries);
-				}
-			}
+            // Create a backup file to restore columns to original length
+            if($execute) {
+                $fh = sugar_fopen('restoreExpand.sql', 'w');
+                if(-1 == fwrite($fh, $theRestoreQueries)) {
+                        $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
+                        echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
+                } else {
+                        $GLOBALS['log']->info($mod_strings['LBL_CREATE_RESOTRE_FILE']);
+                        echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
+                }
+
+                foreach($alter_queries as $key=>$value) {
+                            $db->query($value);
+                }
+            }
+
+            if($export) {
+                    header("Content-Disposition: attachment; filename=expandSugarDB.sql");
+                header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
+                header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
+                header( "Last-Modified: " . TimeDate::httpTime() );
+                header( "Cache-Control: post-check=0, pre-check=0", false );
+                header("Content-Length: ".strlen($theAlterQueries));
+                    echo $theAlterQueries;
+                    die();
+            } else {
+                if(empty($_REQUEST['repair_silent'])) {
+                    echo nl2br($theAlterQueries);
+                }
+            }
 
         } //if-else
-	} // end do_action
+    } // end do_action
 
-	if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
-		if(!file_exists('restoreExpand.sql')) {
-		        echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
+    if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
+        if(!file_exists('restoreExpand.sql')) {
+                echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
 				<form name='repairdb'>
 					<input type='hidden' name='action' value='expandDatabase'>
 					<input type='hidden' name='module' value='Administration'>
@@ -153,12 +153,12 @@ 
 					</select><input type='submit' class='button' value='".$mod_strings['LBL_GO']."'>
 				</form><br><br>
 				".$mod_strings['LBL_EXPAND_DATABASE_TEXT'];
-		} else {
-			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
-		} //if-else
-	} //if
+        } else {
+                echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
+        } //if-else
+    } //if
 }else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 
 

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,23 +39,23 @@ 
  ********************************************************************************/
 
 $db = DBManagerFactory::getInstance();
-if(!$db->supports('fix:expandDatabase')) {
+if (!$db->supports('fix:expandDatabase')) {
 	echo "<BR>";
 	echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
 	echo "<BR>";
 	sugar_die('');
 }
-global $current_user,$beanFiles;
+global $current_user, $beanFiles;
 
 set_time_limit(3600);
-if(is_admin($current_user) || isset($from_sync_client)){
+if (is_admin($current_user) || isset($from_sync_client)) {
 
 	$execute = false;
 	$export = false;
 
 
-	if(isset($_REQUEST['do_action'])){
-		switch($_REQUEST['do_action']){
+	if (isset($_REQUEST['do_action'])) {
+		switch ($_REQUEST['do_action']) {
 			case 'display':
 				break;
 			case 'execute':
@@ -69,8 +69,8 @@ 
 				break;
 		}
 
-		if(!$export && empty($_REQUEST['repair_silent'])){
-			echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
+		if (!$export && empty($_REQUEST['repair_silent'])) {
+			echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], $_REQUEST['do_action']), true);
 		}
 
         $alter_queries = array();
@@ -89,26 +89,26 @@ 
         $alter_queries = array();
         while ($row = $db->fetchByAssoc($result)) {
    	      $length = (int)$row['length'];
-   	      if($length < 255) {
+   	      if ($length < 255) {
    	         $newLength = ($length * 3 < 255) ? $length * 3 : 255;
-   	         $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
-             $theAlterQueries .= $sql . "\n";
+   	         $sql = 'ALTER TABLE '.$row['table_name'].' ALTER COLUMN '.$row['column_name'].' '.$row['type'].' ('.$newLength.')';
+             $theAlterQueries .= $sql."\n";
              $alter_queries[] = $sql;
 
-             $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
-             $theRestoreQueries .= $sql2 . "\n";
+             $sql2 = 'ALTER TABLE '.$row['table_name'].' ALTER COLUMN '.$row['column_name'].' '.$row['type'].' ('.$length.')';
+             $theRestoreQueries .= $sql2."\n";
           }
         } //while
 
         //If there are no ALTER queries to run, echo message
-        if(count($alter_queries) == 0) {
+        if (count($alter_queries) == 0) {
            echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
         } else {
 
 	        // Create a backup file to restore columns to original length
-	        if($execute) {
+	        if ($execute) {
 	           $fh = sugar_fopen('restoreExpand.sql', 'w');
-	           if(-1 == fwrite($fh, $theRestoreQueries)) {
+	           if (-1 == fwrite($fh, $theRestoreQueries)) {
 	           	  $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
 	           	  echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
 	           } else {
@@ -116,22 +116,22 @@ 
 	           	  echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
 	           }
 
-	           foreach($alter_queries as $key=>$value) {
+	           foreach ($alter_queries as $key=>$value) {
 	           	       $db->query($value);
 	           }
 	        }
 
-			if($export) {
+			if ($export) {
 		   		header("Content-Disposition: attachment; filename=expandSugarDB.sql");
 				header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
-				header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-				header( "Last-Modified: " . TimeDate::httpTime() );
-				header( "Cache-Control: post-check=0, pre-check=0", false );
+				header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+				header("Last-Modified: ".TimeDate::httpTime());
+				header("Cache-Control: post-check=0, pre-check=0", false);
 				header("Content-Length: ".strlen($theAlterQueries));
 		   		echo $theAlterQueries;
 		   		die();
 			} else {
-				if(empty($_REQUEST['repair_silent'])) {
+				if (empty($_REQUEST['repair_silent'])) {
 					echo nl2br($theAlterQueries);
 				}
 			}
@@ -139,8 +139,8 @@ 
         } //if-else
 	} // end do_action
 
-	if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
-		if(!file_exists('restoreExpand.sql')) {
+	if (empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
+		if (!file_exists('restoreExpand.sql')) {
 		        echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
 				<form name='repairdb'>
 					<input type='hidden' name='action' value='expandDatabase'>
@@ -157,7 +157,7 @@ 
 			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
 		} //if-else
 	} //if
-}else{
+} else {
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 

Braces +4 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -157,7 +159,7 @@ 
 			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
 		} //if-else
 	} //if
-}else{
+} else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 

modules/Administration/RebuildAudit.php

Indentation +12 added lines, -12 removed lines

@@ -44,18 +44,18 @@
 echo $mod_strings['LBL_REBUILD_AUDIT_SEARCH'] . ' <BR>';
 foreach ($beanFiles as $bean => $file)
 {
-	if(strlen($file) > 0 && file_exists($file)) {
-		require_once($file);
-	    $focus = new $bean();
-		if ($focus->is_AuditEnabled()) {
-			if (!$focus->db->tableExists($focus->get_audit_table_name())) {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
-				$focus->create_audit_table();
-			} else {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
-			}
-		}
-	}
+    if(strlen($file) > 0 && file_exists($file)) {
+        require_once($file);
+        $focus = new $bean();
+        if ($focus->is_AuditEnabled()) {
+            if (!$focus->db->tableExists($focus->get_audit_table_name())) {
+                printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
+                $focus->create_audit_table();
+            } else {
+                printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
+            }
+        }
+    }
 }
 echo $mod_strings['LBL_DONE'];
 ?>
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -41,18 +41,18 @@ 
 include('include/modules.php');
 
 global $beanFiles, $mod_strings;
-echo $mod_strings['LBL_REBUILD_AUDIT_SEARCH'] . ' <BR>';
+echo $mod_strings['LBL_REBUILD_AUDIT_SEARCH'].' <BR>';
 foreach ($beanFiles as $bean => $file)
 {
-	if(strlen($file) > 0 && file_exists($file)) {
+	if (strlen($file) > 0 && file_exists($file)) {
 		require_once($file);
 	    $focus = new $bean();
 		if ($focus->is_AuditEnabled()) {
 			if (!$focus->db->tableExists($focus->get_audit_table_name())) {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
+				printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'], $focus->get_audit_table_name(), $focus->object_name);
 				$focus->create_audit_table();
 			} else {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
+				printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'], $focus->object_name);	
 			}
 		}
 	}

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Administration/upgrade_custom_relationships.php

Indentation +73 added lines, -73 removed lines

@@ -44,82 +44,82 @@
  */
 function upgrade_custom_relationships($modules = array())
 {
-	global $current_user, $moduleList;
-	if (!is_admin($current_user)) sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
+    global $current_user, $moduleList;
+    if (!is_admin($current_user)) sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
 	
-	require_once("modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php");
-	require_once("modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php");
+    require_once("modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php");
+    require_once("modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php");
 	
-	if (empty($modules))
-		$modules = $moduleList;
+    if (empty($modules))
+        $modules = $moduleList;
 	
-	foreach($modules as $module)
-	{
-		$depRels = new DeployedRelationships($module);
-		$relList = $depRels->getRelationshipList();
-		foreach($relList as $relName)
-		{
-			$relObject = $depRels->get($relName);
-			$def = $relObject->getDefinition();
-			//We only need to fix self referencing one to many relationships
-			if ($def['lhs_module'] == $def['rhs_module'] && $def['is_custom'] && $def['relationship_type'] == "one-to-many")
-			{
-				$layout_defs = array();
-				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
-					continue;
-				//Find the extension file containing the vardefs for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
-				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
-					{
-						$dictionary = array($module => array("fields" => array()));
-						$filePath = "custom/Extension/modules/$module/Ext/Vardefs/$file";
-						include($filePath);
-						if(isset($dictionary[$module]["fields"][$relName]))
-						{
-							$rhsDef = $dictionary[$module]["fields"][$relName];
-							//Update the vardef for the left side link field
-							if (!isset($rhsDef['side']) || $rhsDef['side'] != 'left')
-							{
-								$rhsDef['side'] = 'left';
-								$fileContents = file_get_contents($filePath);
-								$out = preg_replace(
-									'/\$dictionary[\w"\'\[\]]*?' . $relName . '["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
-									'$dictionary["' . $module . '"]["fields"]["' . $relName . '"]=' . var_export_helper($rhsDef) . ";",
-									$fileContents
-								);
-								file_put_contents($filePath, $out);
-							}
-						}
-					}
-				}
-				//Find the extension file containing the subpanel definition for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
-				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
-					{
-						$layout_defs = array($module => array("subpanel_setup" => array()));
-						$filePath = "custom/Extension/modules/$module/Ext/Layoutdefs/$file";
-						include($filePath);
-						foreach($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
-						{
-							if ($layout_defs[$module]["subpanel_setup"][$key]['get_subpanel_data'] == $relName)
-							{
-								$fileContents = file_get_contents($filePath);
-								$out = preg_replace(
-									'/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]' . $relName . '[\'"],/s',
-									"'get_subpanel_data' => '{$def["join_key_lhs"]}',",
-									$fileContents
-								);
-								file_put_contents($filePath, $out);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+    foreach($modules as $module)
+    {
+        $depRels = new DeployedRelationships($module);
+        $relList = $depRels->getRelationshipList();
+        foreach($relList as $relName)
+        {
+            $relObject = $depRels->get($relName);
+            $def = $relObject->getDefinition();
+            //We only need to fix self referencing one to many relationships
+            if ($def['lhs_module'] == $def['rhs_module'] && $def['is_custom'] && $def['relationship_type'] == "one-to-many")
+            {
+                $layout_defs = array();
+                if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
+                    continue;
+                //Find the extension file containing the vardefs for this relationship
+                foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
+                {
+                    if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+                    {
+                        $dictionary = array($module => array("fields" => array()));
+                        $filePath = "custom/Extension/modules/$module/Ext/Vardefs/$file";
+                        include($filePath);
+                        if(isset($dictionary[$module]["fields"][$relName]))
+                        {
+                            $rhsDef = $dictionary[$module]["fields"][$relName];
+                            //Update the vardef for the left side link field
+                            if (!isset($rhsDef['side']) || $rhsDef['side'] != 'left')
+                            {
+                                $rhsDef['side'] = 'left';
+                                $fileContents = file_get_contents($filePath);
+                                $out = preg_replace(
+                                    '/\$dictionary[\w"\'\[\]]*?' . $relName . '["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
+                                    '$dictionary["' . $module . '"]["fields"]["' . $relName . '"]=' . var_export_helper($rhsDef) . ";",
+                                    $fileContents
+                                );
+                                file_put_contents($filePath, $out);
+                            }
+                        }
+                    }
+                }
+                //Find the extension file containing the subpanel definition for this relationship
+                foreach(scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
+                {
+                    if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+                    {
+                        $layout_defs = array($module => array("subpanel_setup" => array()));
+                        $filePath = "custom/Extension/modules/$module/Ext/Layoutdefs/$file";
+                        include($filePath);
+                        foreach($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
+                        {
+                            if ($layout_defs[$module]["subpanel_setup"][$key]['get_subpanel_data'] == $relName)
+                            {
+                                $fileContents = file_get_contents($filePath);
+                                $out = preg_replace(
+                                    '/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]' . $relName . '[\'"],/s',
+                                    "'get_subpanel_data' => '{$def["join_key_lhs"]}',",
+                                    $fileContents
+                                );
+                                file_put_contents($filePath, $out);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 if (isset($_REQUEST['execute']) && $_REQUEST['execute'])
-	upgrade_custom_relationships();
\ No newline at end of file
+    upgrade_custom_relationships();
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -53,11 +53,11 @@ 
 	if (empty($modules))
 		$modules = $moduleList;
 	
-	foreach($modules as $module)
+	foreach ($modules as $module)
 	{
 		$depRels = new DeployedRelationships($module);
 		$relList = $depRels->getRelationshipList();
-		foreach($relList as $relName)
+		foreach ($relList as $relName)
 		{
 			$relObject = $depRels->get($relName);
 			$def = $relObject->getDefinition();
@@ -68,14 +68,14 @@ 
 				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
 					continue;
 				//Find the extension file containing the vardefs for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
+				foreach (scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
 				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+					if (substr($file, 0, 1) != "." && strtolower(substr($file, -4)) == ".php")
 					{
 						$dictionary = array($module => array("fields" => array()));
 						$filePath = "custom/Extension/modules/$module/Ext/Vardefs/$file";
 						include($filePath);
-						if(isset($dictionary[$module]["fields"][$relName]))
+						if (isset($dictionary[$module]["fields"][$relName]))
 						{
 							$rhsDef = $dictionary[$module]["fields"][$relName];
 							//Update the vardef for the left side link field
@@ -84,8 +84,8 @@ 
 								$rhsDef['side'] = 'left';
 								$fileContents = file_get_contents($filePath);
 								$out = preg_replace(
-									'/\$dictionary[\w"\'\[\]]*?' . $relName . '["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
-									'$dictionary["' . $module . '"]["fields"]["' . $relName . '"]=' . var_export_helper($rhsDef) . ";",
+									'/\$dictionary[\w"\'\[\]]*?'.$relName.'["\'\[\]]*?\s*?=\s*?array\s*?\(.*?\);/s',
+									'$dictionary["'.$module.'"]["fields"]["'.$relName.'"]='.var_export_helper($rhsDef).";",
 									$fileContents
 								);
 								file_put_contents($filePath, $out);
@@ -94,20 +94,20 @@ 
 					}
 				}
 				//Find the extension file containing the subpanel definition for this relationship
-				foreach(scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
+				foreach (scandir("custom/Extension/modules/$module/Ext/Layoutdefs") as $file)
 				{
-					if (substr($file,0,1) != "." && strtolower(substr($file, -4)) == ".php")
+					if (substr($file, 0, 1) != "." && strtolower(substr($file, -4)) == ".php")
 					{
 						$layout_defs = array($module => array("subpanel_setup" => array()));
 						$filePath = "custom/Extension/modules/$module/Ext/Layoutdefs/$file";
 						include($filePath);
-						foreach($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
+						foreach ($layout_defs[$module]["subpanel_setup"] as $key => $subDef)
 						{
 							if ($layout_defs[$module]["subpanel_setup"][$key]['get_subpanel_data'] == $relName)
 							{
 								$fileContents = file_get_contents($filePath);
 								$out = preg_replace(
-									'/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]' . $relName . '[\'"],/s',
+									'/[\'"]get_subpanel_data[\'"]\s*=>\s*[\'"]'.$relName.'[\'"],/s',
 									"'get_subpanel_data' => '{$def["join_key_lhs"]}',",
 									$fileContents
 								);

Braces +12 added lines, -7 removed lines

@@ -45,13 +45,16 @@ 
 function upgrade_custom_relationships($modules = array())
 {
 	global $current_user, $moduleList;
-	if (!is_admin($current_user)) sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
+	if (!is_admin($current_user)) {
+	    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+	}
 	
 	require_once("modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php");
 	require_once("modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php");
 	
-	if (empty($modules))
-		$modules = $moduleList;
+	if (empty($modules)) {
+			$modules = $moduleList;
+	}
 	
 	foreach($modules as $module)
 	{
@@ -65,8 +68,9 @@ 
 			if ($def['lhs_module'] == $def['rhs_module'] && $def['is_custom'] && $def['relationship_type'] == "one-to-many")
 			{
 				$layout_defs = array();
-				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
-					continue;
+				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs")) {
+									continue;
+				}
 				//Find the extension file containing the vardefs for this relationship
 				foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
 				{
@@ -121,5 +125,6 @@ 
 	}
 }
 
-if (isset($_REQUEST['execute']) && $_REQUEST['execute'])
-	upgrade_custom_relationships();
\ No newline at end of file
+if (isset($_REQUEST['execute']) && $_REQUEST['execute']) {
+	upgrade_custom_relationships();
+}

modules/Administration/DiagnosticDelete.php

Indentation +17 added lines, -17 removed lines

@@ -51,15 +51,15 @@ 
         "Administration",
         array(
             "<a href='index.php?module=Administration&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>",
-           translate('LBL_DIAGNOSTIC_TITLE')
-           ),
+            translate('LBL_DIAGNOSTIC_TITLE')
+            ),
         true
         );
 
 
 if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
-	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
+    echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
 }
 else
 {
@@ -67,21 +67,21 @@ 
     clean_string($_REQUEST['guid'], "ALPHANUM");
     clean_string($_REQUEST['file'], "FILE");
 
-	//Making sure someone doesn't pass a variable name as a false reference
-	//  to delete a file
-	if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
-	{
-		die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
-	}
+    //Making sure someone doesn't pass a variable name as a false reference
+    //  to delete a file
+    if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
+    {
+        die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
+    }
 
-	if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
-	{
-  	  unlink($cachedfile);
-  	  rmdir(dirname($cachedfile));
-	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
-	}
-	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+    if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
+    {
+        unlink($cachedfile);
+        rmdir(dirname($cachedfile));
+        echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
+    }
+    else
+        echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
 }
 
 print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -57,7 +57,7 @@ 
         );
 
 
-if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
+if (empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
 	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
 }
@@ -69,21 +69,21 @@ 
 
 	//Making sure someone doesn't pass a variable name as a false reference
 	//  to delete a file
-	if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
+	if (strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
 	{
 		die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
 	}
 
-	if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
+	if (file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
 	{
   	  unlink($cachedfile);
   	  rmdir(dirname($cachedfile));
 	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
 	}
 	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'].$_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
 }
 
-print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";
+print "<a href=\"index.php?module=Administration&action=index\">".$mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN']."</a><br>";
 
 ?>

Braces +7 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -60,8 +62,7 @@ 
 if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
 	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
-}
-else
+} else
 {
     // Make sure the guid and file are valid file names for security purposes
     clean_string($_REQUEST['guid'], "ALPHANUM");
@@ -79,10 +80,10 @@ 
   	  unlink($cachedfile);
   	  rmdir(dirname($cachedfile));
 	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
+	} else {
+		  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+	}
 	}
-	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
-}
 
 print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";