XoopsModules25x / adminer

index.php

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
     die("XOOPS root path not defined");
 }
 $module_dirname = basename( dirname( __FILE__ ) ) ;
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+	exit( _NOPERM );
+}
 $xoopsOption["template_main"] = $module_dirname . "_index.html";
 
 include(XOOPS_ROOT_PATH."/header.php");

mysql.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
 }
 $module_dirname = basename( dirname( __FILE__ ) ) ;
 include(XOOPS_ROOT_PATH."/header.php");
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+	exit( _NOPERM );
+}
 
 function adminer_object() {
 	class AdminerKfr extends Adminer {

include/bigdump.php

Braces +140 added lines, -110 removed lines

@@ -95,8 +95,9 @@ 
 // If not familiar with PHP please don't change anything below this line
 // *******************************************************************************************
 
-if ($ajax)
+if ($ajax) {
   ob_start();
+}
 
 define ('VERSION','0.34b');
 define ('DATA_CHUNK_LENGTH',16384);  // How many chars are read per time
@@ -112,8 +113,9 @@ 
 @ini_set('auto_detect_line_endings', true);
 @set_time_limit(0);
 
-if (function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
+if (function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get")) {
   @date_default_timezone_set(@date_default_timezone_get());
+}
 
 // Clean and strip anything we don't want from user's input [0.27b]
 
@@ -296,23 +298,30 @@ 
 
 if (!$error)
 { $upload_max_filesize=ini_get("upload_max_filesize");
-  if (preg_match("/([0-9]+)K/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024;
-  if (preg_match("/([0-9]+)M/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024;
-  if (preg_match("/([0-9]+)G/i",$upload_max_filesize,$tempregs)) $upload_max_filesize=$tempregs[1]*1024*1024*1024;
-}
+  if (preg_match("/([0-9]+)K/i",$upload_max_filesize,$tempregs)) {
+  	$upload_max_filesize=$tempregs[1]*1024;
+  }
+  if (preg_match("/([0-9]+)M/i",$upload_max_filesize,$tempregs)) {
+  	$upload_max_filesize=$tempregs[1]*1024*1024;
+  }
+  if (preg_match("/([0-9]+)G/i",$upload_max_filesize,$tempregs)) {
+  	$upload_max_filesize=$tempregs[1]*1024*1024*1024;
+  }
+  }
 
 // Get the current directory
 
-if (isset($_SERVER["CGIA"]))
+if (isset($_SERVER["CGIA"])) {
   $upload_dir=dirname($_SERVER["CGIA"]);
-else if (isset($_SERVER["ORIG_PATH_TRANSLATED"]))
+} else if (isset($_SERVER["ORIG_PATH_TRANSLATED"])) {
   $upload_dir=dirname($_SERVER["ORIG_PATH_TRANSLATED"]);
-else if (isset($_SERVER["ORIG_SCRIPT_FILENAME"]))
+} else if (isset($_SERVER["ORIG_SCRIPT_FILENAME"])) {
   $upload_dir=dirname($_SERVER["ORIG_SCRIPT_FILENAME"]);
-else if (isset($_SERVER["PATH_TRANSLATED"]))
+} else if (isset($_SERVER["PATH_TRANSLATED"])) {
   $upload_dir=dirname($_SERVER["PATH_TRANSLATED"]);
-else 
+} else {
   $upload_dir=dirname($_SERVER["SCRIPT_FILENAME"]);
+}
 
 // Handle file upload
 
@@ -325,19 +334,15 @@ 
 
     if (file_exists($uploaded_filename))
     { echo ("<p class=\"error\">File $uploaded_filename already exist! Delete and upload again!</p>\n");
-    }
-    else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
+    } else if (!preg_match("/(\.(sql|gz|csv))$/i",$uploaded_filename))
     { echo ("<p class=\"error\">You may only upload .sql .gz or .csv files.</p>\n");
-    }
-    else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
+    } else if (!@move_uploaded_file($_FILES["dumpfile"]["tmp_name"],$uploaded_filepath))
     { echo ("<p class=\"error\">Error moving uploaded file ".$_FILES["dumpfile"]["tmp_name"]." to the $uploaded_filepath</p>\n");
       echo ("<p>Check the directory permissions for $upload_dir (must be 777)!</p>\n");
-    }
-    else
+    } else
     { echo ("<p class=\"success\">Uploaded file saved as $uploaded_filename</p>\n");
     }
-  }
-  else
+  } else
   { echo ("<p class=\"error\">Error uploading file ".$_FILES["dumpfile"]["name"]."</p>\n");
   }
 }
@@ -346,25 +351,28 @@ 
 // Handle file deletion (delete only in the current directory for security reasons)
 
 if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"]!=basename($_SERVER["SCRIPT_FILENAME"]))
-{ if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"])))
+{ if (preg_match("/(\.(sql|gz|csv))$/i",$_REQUEST["delete"]) && @unlink(basename($_REQUEST["delete"]))) {
     echo ("<p class=\"success\">".$_REQUEST["delete"]." was removed successfully</p>\n");
-  else
-    echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
-}
+} else {
+      echo ("<p class=\"error\">Can't remove ".$_REQUEST["delete"]."</p>\n");
+  }
+  }
 
 // Connect to the database, set charset and execute pre-queries
 
 if (!$error && !TESTMODE)
 { $dbconnection = @mysql_connect($db_server,$db_username,$db_password);
-  if ($dbconnection) 
-    $db = mysql_select_db($db_name);
+  if ($dbconnection) {
+      $db = mysql_select_db($db_name);
+  }
   if (!$dbconnection || !$db) 
   { echo ("<p class=\"error\">Database connection failed due to ".mysql_error()."</p>\n");
     echo ("<p>Edit the database settings in ".$_SERVER["SCRIPT_FILENAME"]." or contact your database provider.</p>\n");
     $error=true;
   }
-  if (!$error && $db_connection_charset!=='')
-    @mysql_query("SET NAMES $db_connection_charset", $dbconnection);
+  if (!$error && $db_connection_charset!=='') {
+      @mysql_query("SET NAMES $db_connection_charset", $dbconnection);
+  }
 
   if (!$error && isset ($pre_query) && sizeof ($pre_query)>0)
   { reset($pre_query);
@@ -378,8 +386,7 @@ 
      }
     }
   }
-}
-else
+} else
 { $dbconnection = false;
 }
 
@@ -410,29 +417,31 @@ 
           }
           echo ("<tr><td>$dirfile</td><td class=\"right\">".filesize($dirfile)."</td><td>".date ("Y-m-d H:i:s", filemtime($dirfile))."</td>");
 
-          if (preg_match("/\.sql$/i",$dirfile))
-            echo ("<td>SQL</td>");
-          elseif (preg_match("/\.gz$/i",$dirfile))
-            echo ("<td>GZip</td>");
-          elseif (preg_match("/\.csv$/i",$dirfile))
-            echo ("<td>CSV</td>");
-          else
-            echo ("<td>Misc</td>");
-
-          if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile))
-            echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
-          else
-            echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
+          if (preg_match("/\.sql$/i",$dirfile)) {
+                      echo ("<td>SQL</td>");
+          } elseif (preg_match("/\.gz$/i",$dirfile)) {
+                      echo ("<td>GZip</td>");
+          } elseif (preg_match("/\.csv$/i",$dirfile)) {
+                      echo ("<td>CSV</td>");
+          } else {
+                      echo ("<td>Misc</td>");
+          }
+
+          if ((preg_match("/\.gz$/i",$dirfile) && function_exists("gzopen")) || preg_match("/\.sql$/i",$dirfile) || preg_match("/\.csv$/i",$dirfile)) {
+                      echo ("<td><a href=\"".$_SERVER["PHP_SELF"]."?start=1&amp;fn=".urlencode($dirfile)."&amp;foffset=0&amp;totalqueries=0&amp;delimiter=".urlencode($delimiter)."\">Start Import</a> into $db_name at $db_server</td>\n <td><a href=\"".$_SERVER["PHP_SELF"]."?delete=".urlencode($dirfile)."\">Delete file</a></td></tr>\n");
+          } else {
+                      echo ("<td>&nbsp;</td>\n <td>&nbsp;</td></tr>\n");
+          }
         }
       }
     }
 
-    if ($dirhead) 
-      echo ("</table>\n");
-    else 
-      echo ("<p>No uploaded SQL, GZ or CSV files found in the working directory</p>\n");
-  }
-  else
+    if ($dirhead) {
+          echo ("</table>\n");
+    } else {
+          echo ("<p>No uploaded SQL, GZ or CSV files found in the working directory</p>\n");
+    }
+  } else
   { echo ("<p class=\"error\">Error listing directory $upload_dir</p>\n");
     $error=true;
   }
@@ -457,8 +466,7 @@ 
   if (!($tempfile=@fopen($tempfilename,"w")))
   { echo ("<p>Upload form disabled. Permissions for the working directory <i>$upload_dir</i> <b>must be set writable for the webserver</b> in order ");
     echo ("to upload files here. Alternatively you can upload your dump files via FTP.</p>\n");
-  }
-  else
+  } else
   { fclose($tempfile);
     unlink ($tempfilename);
  
@@ -493,19 +501,21 @@ 
 
 // Set current filename ($filename overrides $_REQUEST["fn"] if set)
 
-  if ($filename!="")
-    $curfilename=$filename;
-  else if (isset($_REQUEST["fn"]))
-    $curfilename=urldecode($_REQUEST["fn"]);
-  else
-    $curfilename="";
+  if ($filename!="") {
+      $curfilename=$filename;
+  } else if (isset($_REQUEST["fn"])) {
+      $curfilename=urldecode($_REQUEST["fn"]);
+  } else {
+      $curfilename="";
+  }
 
 // Recognize GZip filename
 
-  if (preg_match("/\.gz$/i",$curfilename)) 
-    $gzipmode=true;
-  else
-    $gzipmode=false;
+  if (preg_match("/\.gz$/i",$curfilename)) {
+      $gzipmode=true;
+  } else {
+      $gzipmode=false;
+  }
 
   if ((!$gzipmode && !$file=@fopen($curfilename,"r")) || ($gzipmode && !$file=@gzopen($curfilename,"r")))
   { echo ("<p class=\"error\">Can't open ".$curfilename." for import</p>\n");
@@ -518,10 +528,13 @@ 
 // Get the file size (can't do it fast on gzipped files, no idea how)
 
   else if ((!$gzipmode && @fseek($file, 0, SEEK_END)==0) || ($gzipmode && @gzseek($file, 0)==0))
-  { if (!$gzipmode) $filesize = ftell($file);
-    else $filesize = gztell($file);                   // Always zero, ignore
-  }
-  else
+  { if (!$gzipmode) {
+  	$filesize = ftell($file);
+  } else {
+    	$filesize = gztell($file);
+    }
+    // Always zero, ignore
+  } else
   { echo ("<p class=\"error\">I can't seek into $curfilename</p>\n");
     $error=true;
   }
@@ -547,16 +560,16 @@ 
   if (!is_numeric($_REQUEST["start"]) || !is_numeric($_REQUEST["foffset"]))
   { echo ("<p class=\"error\">UNEXPECTED: Non-numeric values for start and foffset</p>\n");
     $error=true;
-  }
-  else
+  } else
   {	$_REQUEST["start"]   = floor($_REQUEST["start"]);
     $_REQUEST["foffset"] = floor($_REQUEST["foffset"]);
   }
 
 // Set the current delimiter if defined
 
-  if (isset($_REQUEST["delimiter"]))
-    $delimiter = $_REQUEST["delimiter"];
+  if (isset($_REQUEST["delimiter"])) {
+      $delimiter = $_REQUEST["delimiter"];
+  }
 
 // Empty CSV table if requested
 
@@ -575,8 +588,9 @@ 
 
   if (!$error)
   { skin_open();
-    if (TESTMODE) 
-      echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
+    if (TESTMODE) {
+          echo ("<p class=\"centr\">TEST MODE ENABLED</p>\n");
+    }
     echo ("<p class=\"centr\">Processing file: <b>".$curfilename."</b></p>\n");
     echo ("<p class=\"smlcentr\">Starting from line: ".$_REQUEST["start"]."</p>\n");	
     skin_close();
@@ -615,29 +629,35 @@ 
 
       $dumpline = "";
       while (!feof($file) && substr ($dumpline, -1) != "\n" && substr ($dumpline, -1) != "\r")
-      { if (!$gzipmode)
-          $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
-        else
-          $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
+      { if (!$gzipmode) {
+                $dumpline .= fgets($file, DATA_CHUNK_LENGTH);
+      } else {
+                  $dumpline .= gzgets($file, DATA_CHUNK_LENGTH);
+        }
+      }
+      if ($dumpline==="") {
+      	break;
       }
-      if ($dumpline==="") break;
 
 // Remove UTF8 Byte Order Mark at the file beginning if any
 
-      if ($_REQUEST["foffset"]==0)
-        $dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
+      if ($_REQUEST["foffset"]==0) {
+              $dumpline=preg_replace('|^\xEF\xBB\xBF|','',$dumpline);
+      }
 
 // Create an SQL query from CSV line
 
       if (($csv_insert_table != "") && (preg_match("/(\.csv)$/i",$curfilename)))
       {
-        if ($csv_add_slashes)
-          $dumpline = addslashes($dumpline);
+        if ($csv_add_slashes) {
+                  $dumpline = addslashes($dumpline);
+        }
         $dumpline = explode($csv_delimiter,$dumpline);
-        if ($csv_add_quotes)
-          $dumpline = "'".implode("','",$dumpline)."'";
-        else
-          $dumpline = implode(",",$dumpline);
+        if ($csv_add_quotes) {
+                  $dumpline = "'".implode("','",$dumpline)."'";
+        } else {
+                  $dumpline = implode(",",$dumpline);
+        }
         $dumpline = 'INSERT INTO '.$csv_insert_table.' VALUES ('.$dumpline.');';
       }
 
@@ -651,8 +671,9 @@ 
 
 // Recognize delimiter statement
 
-      if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0)
-        $delimiter = str_replace ("DELIMITER ","",trim($dumpline));
+      if (!$inparents && strpos ($dumpline, "DELIMITER ") === 0) {
+              $delimiter = str_replace ("DELIMITER ","",trim($dumpline));
+      }
 
 // Skip comments and blank lines only if NOT in parents
 
@@ -686,8 +707,9 @@ 
 // Count ' and \' (or " and \") in the dumpline to avoid query break within a text field ending by $delimiter
 
       $parents=substr_count ($dumpline_deslashed, $string_quotes)-substr_count ($dumpline_deslashed, "\\$string_quotes");
-      if ($parents % 2 != 0)
-        $inparents=!$inparents;
+      if ($parents % 2 != 0) {
+              $inparents=!$inparents;
+      }
 
 // Add the line to query
 
@@ -695,8 +717,9 @@ 
 
 // Don't count the line if in parents (text fields may include unlimited linebreaks)
       
-      if (!$inparents)
-        $querylines++;
+      if (!$inparents) {
+              $querylines++;
+      }
       
 // Stop if query contains more lines as defined by MAX_QUERY_LINES
 
@@ -748,10 +771,11 @@ 
 // Get the current file position
 
   if (!$error)
-  { if (!$gzipmode) 
-      $foffset = ftell($file);
-    else
-      $foffset = gztell($file);
+  { if (!$gzipmode) {
+        $foffset = ftell($file);
+  } else {
+          $foffset = gztell($file);
+    }
     if (!$foffset)
     { echo ("<p class=\"error\">UNEXPECTED: Can't read the file pointer offset</p>\n");
       $error=true;
@@ -805,8 +829,7 @@ 
       }
 
       $pct_bar    = "<div style=\"height:15px;width:$pct_done%;background-color:#000080;margin:0px;\"></div>";
-    }
-    else
+    } else
     {
       $bytes_togo  = ' ? ';
       $bytes_tota  = ' ? ';
@@ -864,12 +887,13 @@ 
 <?php      
 
       $error=true; // This is a semi-error telling the script is finished
+    } else
+    { if ($delaypersession!=0) {
+            echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
     }
-    else
-    { if ($delaypersession!=0)
-        echo ("<p class=\"centr\">Now I'm <b>waiting $delaypersession milliseconds</b> before starting next session...</p>\n");
-      if (!$ajax) 
-        echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
+      if (!$ajax) {
+              echo ("<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&fn=".urlencode($curfilename)."&foffset=$foffset&totalqueries=$totalqueries&delimiter=".urlencode($delimiter)."\";',500+$delaypersession);</script>\n");
+      }
 
       echo ("<noscript>\n");
       echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."?start=$linenumber&amp;fn=".urlencode($curfilename)."&amp;foffset=$foffset&amp;totalqueries=$totalqueries&amp;delimiter=".urlencode($delimiter)."\">Continue from the line $linenumber</a> (Enable JavaScript to do it automatically)</p>\n");
@@ -877,20 +901,26 @@ 
    
       echo ("<p class=\"centr\">Press <b><a href=\"".$_SERVER["PHP_SELF"]."\">STOP</a></b> to abort the import <b>OR WAIT!</b></p>\n");
     }
+  } else {
+      echo ("<p class=\"error\">Stopped on error</p>\n");
   }
-  else 
-    echo ("<p class=\"error\">Stopped on error</p>\n");
 
 skin_close();
 
 }
 
-if ($error)
+if ($error) {
   echo ("<p class=\"centr\"><a href=\"".$_SERVER["PHP_SELF"]."\">Start from the beginning</a> (DROP the old tables before restarting)</p>\n");
+}
 
-if ($dbconnection) mysql_close($dbconnection);
-if ($file && !$gzipmode) fclose($file);
-else if ($file && $gzipmode) gzclose($file);
+if ($dbconnection) {
+	mysql_close($dbconnection);
+}
+if ($file && !$gzipmode) {
+	fclose($file);
+} else if ($file && $gzipmode) {
+	gzclose($file);
+}
 
 ?>
 
@@ -923,10 +953,10 @@ 
   {	ob_end_clean();
 	create_xml_response();
 	die;
-  } 
-  else 
-    create_ajax_script();	  
-}
+  } else {
+      create_ajax_script();
+  }
+  }
 
 // Anyway put out the output from above
 

editor.php

Braces +6 added lines, -2 removed lines

@@ -24,8 +24,12 @@
 }
 $module_dirname = basename( dirname( __FILE__ ) ) ;
 include(XOOPS_ROOT_PATH."/header.php");
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+	exit( _NOPERM );
+}
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+	exit( _NOPERM );
+}
 function adminer_object() {
 	class AdminerKfr extends Adminer {
 		function name() {

dump.php

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 if ( !include("../../mainfile.php") ) {
     die("XOOPS root path not defined");
 }
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+	exit( _NOPERM );
+}
 include(XOOPS_ROOT_PATH."/header.php");
 include "./include/bigdump.php";
 ?>
\ No newline at end of file