XoopsModules25x / efqdirectory

xoops_version.php

Spacing +3 added lines, -3 removed lines

@@ -55,9 +55,9 @@
 $modversion['tables'][12] = "efqdiralpha1_dtypes";
 $modversion['tables'][13] = "efqdiralpha1_dtypes_x_cat";
 $modversion['tables'][14] = "efqdiralpha1_coupon";
-$modversion['tables'][15] = "efqdiralpha1_loc";//In case not used in combi with destinations mod.
-$modversion['tables'][16] = "efqdiralpha1_loc_types";//In case not used in combi with destinations mod.
-$modversion['tables'][17] = "efqdiralpha1_loc_x_loctype";//In case not used in combi with destinations mod.
+$modversion['tables'][15] = "efqdiralpha1_loc"; //In case not used in combi with destinations mod.
+$modversion['tables'][16] = "efqdiralpha1_loc_types"; //In case not used in combi with destinations mod.
+$modversion['tables'][17] = "efqdiralpha1_loc_x_loctype"; //In case not used in combi with destinations mod.
 $modversion['tables'][18] = "efqdiralpha1_votedata";
 //$modversion['tables'][19] = "efqdiralpha1_loc_x_address_types";
 $modversion['tables'][20] = "efqdiralpha1_form_options";

header.php

Spacing +3 added lines, -3 removed lines

@@ -30,11 +30,11 @@
 //	Based upon the mylinks and the mxDirectory modules						 //
 // ------------------------------------------------------------------------- //
 include "../../mainfile.php";
-$info =  dirname(__FILE__);
+$info = dirname(__FILE__);
 if (ereg("[\]", $info)) {
-	$split = split("[\]",$info);
+	$split = split("[\]", $info);
 } else {
-	$split = split("[/]",$info);
+	$split = split("[/]", $info);
 }
 $count = count($split) - 1;
 $moddir = $split[$count];

upgrade/class/efqdir_upgrade.php

Indentation +6 added lines, -6 removed lines

@@ -28,12 +28,12 @@
 class EfqDirUpgrade
 {
 	function prepare2upgrade($filename='') {
-	    global $moddir, $xoopsConfig;
-	    include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/class/dbmanager.php';
-	    include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/language/'.$xoopsConfig['language'].'/install.php';
-	    $dbm = new db_manager;
-	    $dbm->queryFromFile(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/sql/'.$filename);
-	    return $dbm->report();
+		global $moddir, $xoopsConfig;
+		include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/class/dbmanager.php';
+		include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/language/'.$xoopsConfig['language'].'/install.php';
+		$dbm = new db_manager;
+		$dbm->queryFromFile(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/sql/'.$filename);
+		return $dbm->report();
 	}
 }
 ?>

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 class EfqDirUpgrade
 {
-	function prepare2upgrade($filename='') {
+	function prepare2upgrade($filename = '') {
 	    global $moddir, $xoopsConfig;
 	    include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/class/dbmanager.php';
 	    include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/language/'.$xoopsConfig['language'].'/install.php';

upgrade/class/dbmanager.php

Indentation +174 added lines, -174 removed lines

@@ -37,205 +37,205 @@
 **/
 class db_manager {
 
-    var $s_tables = array();
-    var $f_tables = array();
+	var $s_tables = array();
+	var $f_tables = array();
 	var $db;
 
-    function db_manager(){
-        $this->db = XoopsDatabaseFactory::getDatabase();
-        $this->db->setPrefix(XOOPS_DB_PREFIX);
-        $this->db->setLogger(XoopsLogger::instance());
-    }
+	function db_manager(){
+		$this->db = XoopsDatabaseFactory::getDatabase();
+		$this->db->setPrefix(XOOPS_DB_PREFIX);
+		$this->db->setLogger(XoopsLogger::instance());
+	}
 
-    function isConnectable(){
-        return ($this->db->connect(false) != false) ? true : false;
-    }
+	function isConnectable(){
+		return ($this->db->connect(false) != false) ? true : false;
+	}
     
-    function dbExists(){
-        return ($this->db->connect() != false) ? true : false;
-    }
+	function dbExists(){
+		return ($this->db->connect() != false) ? true : false;
+	}
     
-    function createDB()
-    {
-        $this->db->connect(false);
+	function createDB()
+	{
+		$this->db->connect(false);
     
-        $result = $this->db->query("CREATE DATABASE ".XOOPS_DB_NAME);
+		$result = $this->db->query("CREATE DATABASE ".XOOPS_DB_NAME);
     
-        return ($result != false) ? true : false;
-    }
+		return ($result != false) ? true : false;
+	}
 
-    function queryFromFile($sql_file_path){
-        global $pieces;
-        $tables = array();
+	function queryFromFile($sql_file_path){
+		global $pieces;
+		$tables = array();
 
-        if (!file_exists($sql_file_path)) {
-            return false;
-        }
-        $sql_query = trim(fread(fopen($sql_file_path, 'r'), filesize($sql_file_path)));
-        SqlUtility::splitMySqlFile($pieces, $sql_query);
-        $this->db->connect();
-        foreach ($pieces as $piece) {
-            $piece = trim($piece);
-            // [0] contains the prefixed query
-            // [4] contains unprefixed table name
-            $prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
-            if ($prefixed_query != false ) {
-                $table = $this->db->prefix($prefixed_query[4]);
-                if($prefixed_query[1] == 'CREATE TABLE'){
-                    if ($this->db->query($prefixed_query[0]) != false) {
-                        if(! isset($this->s_tables['create'][$table])){
-                            $this->s_tables['create'][$table] = 1;
-                        }
-                    }else{
-                        if(! isset($this->f_tables['create'][$table])){
-                            $this->f_tables['create'][$table] = 1;
-                        }
-                    }
-                }
-                elseif($prefixed_query[1] == 'INSERT INTO'){
-                    if ($this->db->query($prefixed_query[0]) != false) {
-                        if(! isset($this->s_tables['insert'][$table])){
-                            $this->s_tables['insert'][$table] = 1;
-                        }else{
-                            $this->s_tables['insert'][$table]++;
-                        }
-                    }else{
-                        if(! isset($this->f_tables['insert'][$table])){
-                            $this->f_tables['insert'][$table] = 1;
-                        }else{
-                             $this->f_tables['insert'][$table]++;
-                        }
-                    }
-                }elseif($prefixed_query[1] == 'ALTER TABLE'){
-                    if ($this->db->query($prefixed_query[0]) != false) {
-                        if(! isset($this->s_tables['alter'][$table])){
-                            $this->s_tables['alter'][$table] = 1;
-                        }
-                    }else{
-                        if(! isset($this->s_tables['alter'][$table])){
-                            $this->f_tables['alter'][$table] = 1;
-                        }
-                    }
-                }elseif($prefixed_query[1] == 'DROP TABLE'){
-                    if ($this->db->query('DROP TABLE '.$table) != false) {
-                        if(! isset($this->s_tables['drop'][$table])){
-                            $this->s_tables['drop'][$table] = 1;
-                        }
-                    }else{
-                        if(! isset($this->s_tables['drop'][$table])){
-                            $this->f_tables['drop'][$table] = 1;
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
+		if (!file_exists($sql_file_path)) {
+			return false;
+		}
+		$sql_query = trim(fread(fopen($sql_file_path, 'r'), filesize($sql_file_path)));
+		SqlUtility::splitMySqlFile($pieces, $sql_query);
+		$this->db->connect();
+		foreach ($pieces as $piece) {
+			$piece = trim($piece);
+			// [0] contains the prefixed query
+			// [4] contains unprefixed table name
+			$prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
+			if ($prefixed_query != false ) {
+				$table = $this->db->prefix($prefixed_query[4]);
+				if($prefixed_query[1] == 'CREATE TABLE'){
+					if ($this->db->query($prefixed_query[0]) != false) {
+						if(! isset($this->s_tables['create'][$table])){
+							$this->s_tables['create'][$table] = 1;
+						}
+					}else{
+						if(! isset($this->f_tables['create'][$table])){
+							$this->f_tables['create'][$table] = 1;
+						}
+					}
+				}
+				elseif($prefixed_query[1] == 'INSERT INTO'){
+					if ($this->db->query($prefixed_query[0]) != false) {
+						if(! isset($this->s_tables['insert'][$table])){
+							$this->s_tables['insert'][$table] = 1;
+						}else{
+							$this->s_tables['insert'][$table]++;
+						}
+					}else{
+						if(! isset($this->f_tables['insert'][$table])){
+							$this->f_tables['insert'][$table] = 1;
+						}else{
+							 $this->f_tables['insert'][$table]++;
+						}
+					}
+				}elseif($prefixed_query[1] == 'ALTER TABLE'){
+					if ($this->db->query($prefixed_query[0]) != false) {
+						if(! isset($this->s_tables['alter'][$table])){
+							$this->s_tables['alter'][$table] = 1;
+						}
+					}else{
+						if(! isset($this->s_tables['alter'][$table])){
+							$this->f_tables['alter'][$table] = 1;
+						}
+					}
+				}elseif($prefixed_query[1] == 'DROP TABLE'){
+					if ($this->db->query('DROP TABLE '.$table) != false) {
+						if(! isset($this->s_tables['drop'][$table])){
+							$this->s_tables['drop'][$table] = 1;
+						}
+					}else{
+						if(! isset($this->s_tables['drop'][$table])){
+							$this->f_tables['drop'][$table] = 1;
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
 
-    function report(){
-        $content = "<table align='center'><tr><td align='left'>\n";
-        if (isset($this->s_tables['create'])) {
-            foreach($this->s_tables['create'] as $key => $val){
-                $content .= sprintf(_INSTALL_L45, "<b>$key</b>")."<br />\n";
-            }
-        }
-        if (isset($this->s_tables['insert'])) {
-            foreach($this->s_tables['insert'] as $key => $val){
-                $content .= sprintf(_INSTALL_L119, $val, "<b>$key</b>")."<br />\n";
-            }
-        }
+	function report(){
+		$content = "<table align='center'><tr><td align='left'>\n";
+		if (isset($this->s_tables['create'])) {
+			foreach($this->s_tables['create'] as $key => $val){
+				$content .= sprintf(_INSTALL_L45, "<b>$key</b>")."<br />\n";
+			}
+		}
+		if (isset($this->s_tables['insert'])) {
+			foreach($this->s_tables['insert'] as $key => $val){
+				$content .= sprintf(_INSTALL_L119, $val, "<b>$key</b>")."<br />\n";
+			}
+		}
 		if (isset($this->s_tables['alter'])) {
-            foreach($this->s_tables['alter'] as $key => $val){
-                $content .= sprintf(_INSTALL_L133, "<b>$key</b>")."<br />\n";
-            }
-        }
+			foreach($this->s_tables['alter'] as $key => $val){
+				$content .= sprintf(_INSTALL_L133, "<b>$key</b>")."<br />\n";
+			}
+		}
 		if (isset($this->s_tables['drop'])) {
-            foreach($this->s_tables['drop'] as $key => $val){
-                $content .= sprintf(_INSTALL_L163, "<b>$key</b>")."<br />\n";
-            }
-        }
-        $content .= "<br />\n";
-        if (isset($this->f_tables['create'])) {
-            foreach($this->f_tables['create'] as $key => $val){
-                $content .= sprintf(_INSTALL_L118, "<b>$key</b>")."<br />\n";
-            }
-        }
-        if (isset($this->f_tables['insert'])) {
-            foreach($this->f_tables['insert'] as $key => $val){
-                $content .= sprintf(_INSTALL_L120, $val, "<b>$key</b>")."<br />\n";
-            }
-        }
+			foreach($this->s_tables['drop'] as $key => $val){
+				$content .= sprintf(_INSTALL_L163, "<b>$key</b>")."<br />\n";
+			}
+		}
+		$content .= "<br />\n";
+		if (isset($this->f_tables['create'])) {
+			foreach($this->f_tables['create'] as $key => $val){
+				$content .= sprintf(_INSTALL_L118, "<b>$key</b>")."<br />\n";
+			}
+		}
+		if (isset($this->f_tables['insert'])) {
+			foreach($this->f_tables['insert'] as $key => $val){
+				$content .= sprintf(_INSTALL_L120, $val, "<b>$key</b>")."<br />\n";
+			}
+		}
 		if (isset($this->f_tables['alter'])) {
-            foreach($this->f_tables['alter'] as $key => $val){
-                $content .= sprintf(_INSTALL_L134, "<b>$key</b>")."<br />\n";
-            }
-        }
+			foreach($this->f_tables['alter'] as $key => $val){
+				$content .= sprintf(_INSTALL_L134, "<b>$key</b>")."<br />\n";
+			}
+		}
 		if (isset($this->f_tables['drop'])) {
-            foreach($this->f_tables['drop'] as $key => $val){
-                $content .= sprintf(_INSTALL_L164, "<b>$key</b>")."<br />\n";
-            }
-        }
-        $content .= "</td></tr></table>\n";
-        return $content;
-    }
+			foreach($this->f_tables['drop'] as $key => $val){
+				$content .= sprintf(_INSTALL_L164, "<b>$key</b>")."<br />\n";
+			}
+		}
+		$content .= "</td></tr></table>\n";
+		return $content;
+	}
 
-    function query($sql){
-        $this->db->connect();
-        return $this->db->query($sql);
-    }
+	function query($sql){
+		$this->db->connect();
+		return $this->db->query($sql);
+	}
 
-    function prefix($table){
-        $this->db->connect();
-        return $this->db->prefix($table);
-    }
+	function prefix($table){
+		$this->db->connect();
+		return $this->db->prefix($table);
+	}
 
-    function fetchArray($ret){
-        $this->db->connect();
-        return $this->db->fetchArray($ret);
-    }
+	function fetchArray($ret){
+		$this->db->connect();
+		return $this->db->fetchArray($ret);
+	}
 
-    function insert($table, $query){
-        $this->db->connect();
-        $table = $this->db->prefix($table);
-        $query = 'INSERT INTO '.$table.' '.$query;
-        if(!$this->db->queryF($query)){
-            if(!isset($this->f_tables['insert'][$table])){
-                $this->f_tables['insert'][$table] = 1;
-            }else{
-                $this->f_tables['insert'][$table]++;
-            }
-            return false;
-        }else{
-            if(!isset($this->s_tables['insert'][$table])){
-                $this->s_tables['insert'][$table] = 1;
-            }else{
-                $this->s_tables['insert'][$table]++;
-            }
-            return $this->db->getInsertId();
-        }
-    }
+	function insert($table, $query){
+		$this->db->connect();
+		$table = $this->db->prefix($table);
+		$query = 'INSERT INTO '.$table.' '.$query;
+		if(!$this->db->queryF($query)){
+			if(!isset($this->f_tables['insert'][$table])){
+				$this->f_tables['insert'][$table] = 1;
+			}else{
+				$this->f_tables['insert'][$table]++;
+			}
+			return false;
+		}else{
+			if(!isset($this->s_tables['insert'][$table])){
+				$this->s_tables['insert'][$table] = 1;
+			}else{
+				$this->s_tables['insert'][$table]++;
+			}
+			return $this->db->getInsertId();
+		}
+	}
 
-    function isError(){
-        return (isset($this->f_tables)) ? true : false;
-    }
+	function isError(){
+		return (isset($this->f_tables)) ? true : false;
+	}
 
-    function deleteTables($tables){
-        global $ct;
-        $deleted = array();
-        $this->db->connect();
-        foreach ($tables as $key => $val) {
-            if(! $this->db->query("DROP TABLE ".$this->db->prefix($key))){
-                $deleted[] = $ct;
-            }
-        }
-        return $deleted;
-    }
+	function deleteTables($tables){
+		global $ct;
+		$deleted = array();
+		$this->db->connect();
+		foreach ($tables as $key => $val) {
+			if(! $this->db->query("DROP TABLE ".$this->db->prefix($key))){
+				$deleted[] = $ct;
+			}
+		}
+		return $deleted;
+	}
 
 	function tableExists($table){
 		$table = trim($table);
 		$ret = false;
 		if ($table != '') {
-            $this->db->connect();
+			$this->db->connect();
 			$sql = 'SELECT * FROM '.$this->db->prefix($table);
 			$ret = (false != $this->db->query($sql)) ? true : false;
 		}

Spacing +46 added lines, -46 removed lines

@@ -41,17 +41,17 @@ 
     var $f_tables = array();
 	var $db;
 
-    function db_manager(){
+    function db_manager() {
         $this->db = XoopsDatabaseFactory::getDatabase();
         $this->db->setPrefix(XOOPS_DB_PREFIX);
         $this->db->setLogger(XoopsLogger::instance());
     }
 
-    function isConnectable(){
+    function isConnectable() {
         return ($this->db->connect(false) != false) ? true : false;
     }
     
-    function dbExists(){
+    function dbExists() {
         return ($this->db->connect() != false) ? true : false;
     }
     
@@ -64,7 +64,7 @@ 
         return ($result != false) ? true : false;
     }
 
-    function queryFromFile($sql_file_path){
+    function queryFromFile($sql_file_path) {
         global $pieces;
         $tables = array();
 
@@ -79,50 +79,50 @@ 
             // [0] contains the prefixed query
             // [4] contains unprefixed table name
             $prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
-            if ($prefixed_query != false ) {
+            if ($prefixed_query != false) {
                 $table = $this->db->prefix($prefixed_query[4]);
-                if($prefixed_query[1] == 'CREATE TABLE'){
+                if ($prefixed_query[1] == 'CREATE TABLE') {
                     if ($this->db->query($prefixed_query[0]) != false) {
-                        if(! isset($this->s_tables['create'][$table])){
+                        if (!isset($this->s_tables['create'][$table])) {
                             $this->s_tables['create'][$table] = 1;
                         }
-                    }else{
-                        if(! isset($this->f_tables['create'][$table])){
+                    } else {
+                        if (!isset($this->f_tables['create'][$table])) {
                             $this->f_tables['create'][$table] = 1;
                         }
                     }
                 }
-                elseif($prefixed_query[1] == 'INSERT INTO'){
+                elseif ($prefixed_query[1] == 'INSERT INTO') {
                     if ($this->db->query($prefixed_query[0]) != false) {
-                        if(! isset($this->s_tables['insert'][$table])){
+                        if (!isset($this->s_tables['insert'][$table])) {
                             $this->s_tables['insert'][$table] = 1;
-                        }else{
+                        } else {
                             $this->s_tables['insert'][$table]++;
                         }
-                    }else{
-                        if(! isset($this->f_tables['insert'][$table])){
+                    } else {
+                        if (!isset($this->f_tables['insert'][$table])) {
                             $this->f_tables['insert'][$table] = 1;
-                        }else{
+                        } else {
                              $this->f_tables['insert'][$table]++;
                         }
                     }
-                }elseif($prefixed_query[1] == 'ALTER TABLE'){
+                }elseif ($prefixed_query[1] == 'ALTER TABLE') {
                     if ($this->db->query($prefixed_query[0]) != false) {
-                        if(! isset($this->s_tables['alter'][$table])){
+                        if (!isset($this->s_tables['alter'][$table])) {
                             $this->s_tables['alter'][$table] = 1;
                         }
-                    }else{
-                        if(! isset($this->s_tables['alter'][$table])){
+                    } else {
+                        if (!isset($this->s_tables['alter'][$table])) {
                             $this->f_tables['alter'][$table] = 1;
                         }
                     }
-                }elseif($prefixed_query[1] == 'DROP TABLE'){
+                }elseif ($prefixed_query[1] == 'DROP TABLE') {
                     if ($this->db->query('DROP TABLE '.$table) != false) {
-                        if(! isset($this->s_tables['drop'][$table])){
+                        if (!isset($this->s_tables['drop'][$table])) {
                             $this->s_tables['drop'][$table] = 1;
                         }
-                    }else{
-                        if(! isset($this->s_tables['drop'][$table])){
+                    } else {
+                        if (!isset($this->s_tables['drop'][$table])) {
                             $this->f_tables['drop'][$table] = 1;
                         }
                     }
@@ -132,46 +132,46 @@ 
         return true;
     }
 
-    function report(){
+    function report() {
         $content = "<table align='center'><tr><td align='left'>\n";
         if (isset($this->s_tables['create'])) {
-            foreach($this->s_tables['create'] as $key => $val){
+            foreach ($this->s_tables['create'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L45, "<b>$key</b>")."<br />\n";
             }
         }
         if (isset($this->s_tables['insert'])) {
-            foreach($this->s_tables['insert'] as $key => $val){
+            foreach ($this->s_tables['insert'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L119, $val, "<b>$key</b>")."<br />\n";
             }
         }
 		if (isset($this->s_tables['alter'])) {
-            foreach($this->s_tables['alter'] as $key => $val){
+            foreach ($this->s_tables['alter'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L133, "<b>$key</b>")."<br />\n";
             }
         }
 		if (isset($this->s_tables['drop'])) {
-            foreach($this->s_tables['drop'] as $key => $val){
+            foreach ($this->s_tables['drop'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L163, "<b>$key</b>")."<br />\n";
             }
         }
         $content .= "<br />\n";
         if (isset($this->f_tables['create'])) {
-            foreach($this->f_tables['create'] as $key => $val){
+            foreach ($this->f_tables['create'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L118, "<b>$key</b>")."<br />\n";
             }
         }
         if (isset($this->f_tables['insert'])) {
-            foreach($this->f_tables['insert'] as $key => $val){
+            foreach ($this->f_tables['insert'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L120, $val, "<b>$key</b>")."<br />\n";
             }
         }
 		if (isset($this->f_tables['alter'])) {
-            foreach($this->f_tables['alter'] as $key => $val){
+            foreach ($this->f_tables['alter'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L134, "<b>$key</b>")."<br />\n";
             }
         }
 		if (isset($this->f_tables['drop'])) {
-            foreach($this->f_tables['drop'] as $key => $val){
+            foreach ($this->f_tables['drop'] as $key => $val) {
                 $content .= sprintf(_INSTALL_L164, "<b>$key</b>")."<br />\n";
             }
         }
@@ -179,59 +179,59 @@ 
         return $content;
     }
 
-    function query($sql){
+    function query($sql) {
         $this->db->connect();
         return $this->db->query($sql);
     }
 
-    function prefix($table){
+    function prefix($table) {
         $this->db->connect();
         return $this->db->prefix($table);
     }
 
-    function fetchArray($ret){
+    function fetchArray($ret) {
         $this->db->connect();
         return $this->db->fetchArray($ret);
     }
 
-    function insert($table, $query){
+    function insert($table, $query) {
         $this->db->connect();
         $table = $this->db->prefix($table);
         $query = 'INSERT INTO '.$table.' '.$query;
-        if(!$this->db->queryF($query)){
-            if(!isset($this->f_tables['insert'][$table])){
+        if (!$this->db->queryF($query)) {
+            if (!isset($this->f_tables['insert'][$table])) {
                 $this->f_tables['insert'][$table] = 1;
-            }else{
+            } else {
                 $this->f_tables['insert'][$table]++;
             }
             return false;
-        }else{
-            if(!isset($this->s_tables['insert'][$table])){
+        } else {
+            if (!isset($this->s_tables['insert'][$table])) {
                 $this->s_tables['insert'][$table] = 1;
-            }else{
+            } else {
                 $this->s_tables['insert'][$table]++;
             }
             return $this->db->getInsertId();
         }
     }
 
-    function isError(){
+    function isError() {
         return (isset($this->f_tables)) ? true : false;
     }
 
-    function deleteTables($tables){
+    function deleteTables($tables) {
         global $ct;
         $deleted = array();
         $this->db->connect();
         foreach ($tables as $key => $val) {
-            if(! $this->db->query("DROP TABLE ".$this->db->prefix($key))){
+            if (!$this->db->query("DROP TABLE ".$this->db->prefix($key))) {
                 $deleted[] = $ct;
             }
         }
         return $deleted;
     }
 
-	function tableExists($table){
+	function tableExists($table) {
 		$table = trim($table);
 		$ret = false;
 		if ($table != '') {

Braces +12 added lines, -13 removed lines

@@ -86,42 +86,41 @@ 
                         if(! isset($this->s_tables['create'][$table])){
                             $this->s_tables['create'][$table] = 1;
                         }
-                    }else{
+                    } else{
                         if(! isset($this->f_tables['create'][$table])){
                             $this->f_tables['create'][$table] = 1;
                         }
                     }
-                }
-                elseif($prefixed_query[1] == 'INSERT INTO'){
+                } elseif($prefixed_query[1] == 'INSERT INTO'){
                     if ($this->db->query($prefixed_query[0]) != false) {
                         if(! isset($this->s_tables['insert'][$table])){
                             $this->s_tables['insert'][$table] = 1;
-                        }else{
+                        } else{
                             $this->s_tables['insert'][$table]++;
                         }
-                    }else{
+                    } else{
                         if(! isset($this->f_tables['insert'][$table])){
                             $this->f_tables['insert'][$table] = 1;
-                        }else{
+                        } else{
                              $this->f_tables['insert'][$table]++;
                         }
                     }
-                }elseif($prefixed_query[1] == 'ALTER TABLE'){
+                } elseif($prefixed_query[1] == 'ALTER TABLE'){
                     if ($this->db->query($prefixed_query[0]) != false) {
                         if(! isset($this->s_tables['alter'][$table])){
                             $this->s_tables['alter'][$table] = 1;
                         }
-                    }else{
+                    } else{
                         if(! isset($this->s_tables['alter'][$table])){
                             $this->f_tables['alter'][$table] = 1;
                         }
                     }
-                }elseif($prefixed_query[1] == 'DROP TABLE'){
+                } elseif($prefixed_query[1] == 'DROP TABLE'){
                     if ($this->db->query('DROP TABLE '.$table) != false) {
                         if(! isset($this->s_tables['drop'][$table])){
                             $this->s_tables['drop'][$table] = 1;
                         }
-                    }else{
+                    } else{
                         if(! isset($this->s_tables['drop'][$table])){
                             $this->f_tables['drop'][$table] = 1;
                         }
@@ -201,14 +200,14 @@ 
         if(!$this->db->queryF($query)){
             if(!isset($this->f_tables['insert'][$table])){
                 $this->f_tables['insert'][$table] = 1;
-            }else{
+            } else{
                 $this->f_tables['insert'][$table]++;
             }
             return false;
-        }else{
+        } else{
             if(!isset($this->s_tables['insert'][$table])){
                 $this->s_tables['insert'][$table] = 1;
-            }else{
+            } else{
                 $this->s_tables['insert'][$table]++;
             }
             return $this->db->getInsertId();

upgrade/index.php

Indentation +11 added lines, -11 removed lines

@@ -9,17 +9,17 @@
 xoops_cp_header();
 set_magic_quotes_runtime(1);
 if (isset($_POST['submit'])) {
-    switch($_POST['submit']) {
-        case "Update":
-        include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/class/dbmanager.php';
-	    $dbm = new db_manager;
-	    $dbm->queryFromFile(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/sql/'.$filename);
-	    $feedback = $dbm->report();
-	    echo $feedback;
-	    echo "<br /><br /><a href='".XOOPS_URL."/modules/system/admin.php?fct=modulesadmin'>Proceed</a>";
-	    xoops_cp_footer();
-	    exit();
-    }
+	switch($_POST['submit']) {
+		case "Update":
+		include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/class/dbmanager.php';
+		$dbm = new db_manager;
+		$dbm->queryFromFile(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/sql/'.$filename);
+		$feedback = $dbm->report();
+		echo $feedback;
+		echo "<br /><br /><a href='".XOOPS_URL."/modules/system/admin.php?fct=modulesadmin'>Proceed</a>";
+		xoops_cp_footer();
+		exit();
+	}
 }
 include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
 $upgrade_form = new XoopsThemeForm('Upgrade', 'upgradeform', 'index.php');

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 xoops_cp_header();
 set_magic_quotes_runtime(1);
 if (isset($_POST['submit'])) {
-    switch($_POST['submit']) {
+    switch ($_POST['submit']) {
         case "Update":
         include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/upgrade/class/dbmanager.php';
 	    $dbm = new db_manager;

upgrade/language/english/install.php

Spacing +162 added lines, -162 removed lines

@@ -1,182 +1,182 @@
 <?php
 // $Id: install.php 2 2008-01-27 18:16:55Z wtravel $
-define("_INSTALL_L0","Welcome to the Install Wizard for XOOPS 2.0");
-define("_INSTALL_L70","Please change the file permission for mainfile.php so that it is writeable by the server (i.e. chmod 777 mainfile.php on a UNIX/LINUX server, or check the properties of the file and make sure the read-only flag is not set on a Windows server ). Reload this page once you have changed the permission setting.");
+define("_INSTALL_L0", "Welcome to the Install Wizard for XOOPS 2.0");
+define("_INSTALL_L70", "Please change the file permission for mainfile.php so that it is writeable by the server (i.e. chmod 777 mainfile.php on a UNIX/LINUX server, or check the properties of the file and make sure the read-only flag is not set on a Windows server ). Reload this page once you have changed the permission setting.");
 //define("_INSTALL_L71","Click on the button below to begin the installation.");
-define("_INSTALL_L1","Open mainfile.php with your text editor and find the following codes on line 31:");
-define("_INSTALL_L2","Now, change this line to:");
-define("_INSTALL_L3","Next, on line 35, change %s to %s");
-define("_INSTALL_L4","OK, I have set the above setings, let me try again!");
-define("_INSTALL_L5","WARNING!");
-define("_INSTALL_L6","There is a mismatch between your XOOPS_ROOT_PATH configuration on line 31 of mainfile.php and the root path info we have detected.");
-define("_INSTALL_L7","Your setting: ");
-define("_INSTALL_L8","We detected: ");
-define("_INSTALL_L9","( On MS platforms, you may receive this error message even when your configuration is correct. If that is the case, please press the button below to continue)");
-define("_INSTALL_L10","Plesae press the button below to continue if this is really ok.");
-define("_INSTALL_L11","The server path to your XOOPS root directory: ");
-define("_INSTALL_L12","URL to your XOOPS root directory: ");
-define("_INSTALL_L13","If the above setting is correct, press the button below to continue.");
-define("_INSTALL_L14","Next");
-define("_INSTALL_L15","Please open mainfile.php and enter required DB settings data");
-define("_INSTALL_L16","%s is the hostname of your database server.");
-define("_INSTALL_L17","%s is the username of your database account.");
-define("_INSTALL_L18","%s is the password required to access your database.");
-define("_INSTALL_L19","%s is the name of your database in which XOOPS tables will be created.");
-define("_INSTALL_L20","%s is the prefix for tables that will be made during the installation.");
-define("_INSTALL_L21","The following database was not found on the server:");
-define("_INSTALL_L22","Attempt to create it?");
-define("_INSTALL_L23","Yes");
-define("_INSTALL_L24","No");
-define("_INSTALL_L25","We have detected the following database information from your configuration in mainfile.php. Please fix it now if this is not correct.");
-define("_INSTALL_L26","Database Configuration");
-define("_INSTALL_L51","Database");
-define("_INSTALL_L66","Choose the database to be used");
-define("_INSTALL_L27","Database Hostname");
-define("_INSTALL_L67","Hostname of the database server. If you are unsure, 'localhost' works in most cases.");
-define("_INSTALL_L28","Database Username");
-define("_INSTALL_L65","Your database user account on the host");
-define("_INSTALL_L29","Database Name");
-define("_INSTALL_L64","The name of database on the host. The installer will attempt to create the database if not exist");
-define("_INSTALL_L52","Database Password");
-define("_INSTALL_L68","Password for your database user account");
-define("_INSTALL_L30","Table Prefix");
-define("_INSTALL_L63","This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.");
-define("_INSTALL_L54","Use persistent connection?");
-define("_INSTALL_L69","Default is 'NO'. Choose 'NO' if you are unsure.");
-define("_INSTALL_L55","XOOPS Physical Path");
-define("_INSTALL_L59","Physical path to your main XOOPS directory WITHOUT trailing slash");
-define("_INSTALL_L56","XOOPS Virtual Path (URL)");
-define("_INSTALL_L58","Virtual path to your main XOOPS directory WITHOUT trailing slash");
-
-define("_INSTALL_L31","Could not create database. Contact the server administrator for details.");
-define("_INSTALL_L32","Installation Complete");
-define("_INSTALL_L33","Click <a href='../index.php'>HERE</a> to see the home page of your site.");
-define("_INSTALL_L35","If you had any errors, please contact the dev team at <a href='http://www.xoops.org/' target='_blank'>XOOPS.org</a>");
-define("_INSTALL_L36","Please choose your site admin's name and password.");
-define("_INSTALL_L37","Admin Name");
-define("_INSTALL_L38","Admin Email");
-define("_INSTALL_L39","Admin Password");
-define("_INSTALL_L74","Confirm Password");
-define("_INSTALL_L40","Create Tables");
-define("_INSTALL_L41","Please go back and type in all the required info.");
-define("_INSTALL_L42","Back");
-define("_INSTALL_L57","Please enter %s");
+define("_INSTALL_L1", "Open mainfile.php with your text editor and find the following codes on line 31:");
+define("_INSTALL_L2", "Now, change this line to:");
+define("_INSTALL_L3", "Next, on line 35, change %s to %s");
+define("_INSTALL_L4", "OK, I have set the above setings, let me try again!");
+define("_INSTALL_L5", "WARNING!");
+define("_INSTALL_L6", "There is a mismatch between your XOOPS_ROOT_PATH configuration on line 31 of mainfile.php and the root path info we have detected.");
+define("_INSTALL_L7", "Your setting: ");
+define("_INSTALL_L8", "We detected: ");
+define("_INSTALL_L9", "( On MS platforms, you may receive this error message even when your configuration is correct. If that is the case, please press the button below to continue)");
+define("_INSTALL_L10", "Plesae press the button below to continue if this is really ok.");
+define("_INSTALL_L11", "The server path to your XOOPS root directory: ");
+define("_INSTALL_L12", "URL to your XOOPS root directory: ");
+define("_INSTALL_L13", "If the above setting is correct, press the button below to continue.");
+define("_INSTALL_L14", "Next");
+define("_INSTALL_L15", "Please open mainfile.php and enter required DB settings data");
+define("_INSTALL_L16", "%s is the hostname of your database server.");
+define("_INSTALL_L17", "%s is the username of your database account.");
+define("_INSTALL_L18", "%s is the password required to access your database.");
+define("_INSTALL_L19", "%s is the name of your database in which XOOPS tables will be created.");
+define("_INSTALL_L20", "%s is the prefix for tables that will be made during the installation.");
+define("_INSTALL_L21", "The following database was not found on the server:");
+define("_INSTALL_L22", "Attempt to create it?");
+define("_INSTALL_L23", "Yes");
+define("_INSTALL_L24", "No");
+define("_INSTALL_L25", "We have detected the following database information from your configuration in mainfile.php. Please fix it now if this is not correct.");
+define("_INSTALL_L26", "Database Configuration");
+define("_INSTALL_L51", "Database");
+define("_INSTALL_L66", "Choose the database to be used");
+define("_INSTALL_L27", "Database Hostname");
+define("_INSTALL_L67", "Hostname of the database server. If you are unsure, 'localhost' works in most cases.");
+define("_INSTALL_L28", "Database Username");
+define("_INSTALL_L65", "Your database user account on the host");
+define("_INSTALL_L29", "Database Name");
+define("_INSTALL_L64", "The name of database on the host. The installer will attempt to create the database if not exist");
+define("_INSTALL_L52", "Database Password");
+define("_INSTALL_L68", "Password for your database user account");
+define("_INSTALL_L30", "Table Prefix");
+define("_INSTALL_L63", "This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.");
+define("_INSTALL_L54", "Use persistent connection?");
+define("_INSTALL_L69", "Default is 'NO'. Choose 'NO' if you are unsure.");
+define("_INSTALL_L55", "XOOPS Physical Path");
+define("_INSTALL_L59", "Physical path to your main XOOPS directory WITHOUT trailing slash");
+define("_INSTALL_L56", "XOOPS Virtual Path (URL)");
+define("_INSTALL_L58", "Virtual path to your main XOOPS directory WITHOUT trailing slash");
+
+define("_INSTALL_L31", "Could not create database. Contact the server administrator for details.");
+define("_INSTALL_L32", "Installation Complete");
+define("_INSTALL_L33", "Click <a href='../index.php'>HERE</a> to see the home page of your site.");
+define("_INSTALL_L35", "If you had any errors, please contact the dev team at <a href='http://www.xoops.org/' target='_blank'>XOOPS.org</a>");
+define("_INSTALL_L36", "Please choose your site admin's name and password.");
+define("_INSTALL_L37", "Admin Name");
+define("_INSTALL_L38", "Admin Email");
+define("_INSTALL_L39", "Admin Password");
+define("_INSTALL_L74", "Confirm Password");
+define("_INSTALL_L40", "Create Tables");
+define("_INSTALL_L41", "Please go back and type in all the required info.");
+define("_INSTALL_L42", "Back");
+define("_INSTALL_L57", "Please enter %s");
 
 // %s is database name
-define("_INSTALL_L43","Database %s created!");
+define("_INSTALL_L43", "Database %s created!");
 
 // %s is table name
-define("_INSTALL_L44","Unable to make %s");
-define("_INSTALL_L45","Table %s created.");
+define("_INSTALL_L44", "Unable to make %s");
+define("_INSTALL_L45", "Table %s created.");
 
-define("_INSTALL_L46","In order for the modules included in the package to work correctly, the following files must be writeable by the server. Please change the permission setting for these files. (i.e. 'chmod 666 file_name' and 'chmod 777 dir_name' on a UNIX/LINUX server, or check the properties of the file and make sure the read-only flag is not set on a Windows server)");
-define("_INSTALL_L47","Next");
+define("_INSTALL_L46", "In order for the modules included in the package to work correctly, the following files must be writeable by the server. Please change the permission setting for these files. (i.e. 'chmod 666 file_name' and 'chmod 777 dir_name' on a UNIX/LINUX server, or check the properties of the file and make sure the read-only flag is not set on a Windows server)");
+define("_INSTALL_L47", "Next");
 
-define("_INSTALL_L53","Please confirm the following submitted data:");
+define("_INSTALL_L53", "Please confirm the following submitted data:");
 
-define("_INSTALL_L60","Could not write into mainfile.php. Please check the file permission and try again.");
-define("_INSTALL_L61","Could not write to mainfile.php. Contact the server administrator for details.");
-define("_INSTALL_L62","Configuration data has been saved successfully to mainfile.php.");
-define("_INSTALL_L72","The following directories must be created with the write permission by the server. (i.e. 'chmod 777 directory_name' on a UNIX/LINUX server)");
-define("_INSTALL_L73","Invalid Email");
+define("_INSTALL_L60", "Could not write into mainfile.php. Please check the file permission and try again.");
+define("_INSTALL_L61", "Could not write to mainfile.php. Contact the server administrator for details.");
+define("_INSTALL_L62", "Configuration data has been saved successfully to mainfile.php.");
+define("_INSTALL_L72", "The following directories must be created with the write permission by the server. (i.e. 'chmod 777 directory_name' on a UNIX/LINUX server)");
+define("_INSTALL_L73", "Invalid Email");
 
 // add by haruki
-define("_INSTALL_L80","introduction");
-define("_INSTALL_L81","check file permissions");
-define("_INSTALL_L82","Checking file and directory permissions..");
-define("_INSTALL_L83","File %s is NOT writable.");
-define("_INSTALL_L84","File %s is writable.");
-define("_INSTALL_L85","Directory %s is NOT writable.");
-define("_INSTALL_L86","Directory %s is writable.");
-define("_INSTALL_L87","No errors detected.");
-define("_INSTALL_L89","general settings");
-define("_INSTALL_L90","General configuration");
-define("_INSTALL_L91","confirm");
-define("_INSTALL_L92","save settings");
-define("_INSTALL_L93","modify settings");
-define("_INSTALL_L88","Saving configuration data..");
-define("_INSTALL_L94","check path & URL");
-define("_INSTALL_L127","Checking file path & URL settings..");
-define("_INSTALL_L95","Could not detect the physical path to your XOOPS directory.");
-define("_INSTALL_L96","There is a conflict between the detected physical path (%s) and the one you input.");
-define("_INSTALL_L97","<b>Physical path</b> is correct.");
-
-define("_INSTALL_L99","<b>Physical path</b> must be a directory.");
-define("_INSTALL_L100","<b>Virtual path</b> is a valid URL.");
-define("_INSTALL_L101","<b>Virtual path</b> is not a valid URL.");
-define("_INSTALL_L102","confirm database settings");
-define("_INSTALL_L103","restart from the beginning");
-define("_INSTALL_L104","check database");
-define("_INSTALL_L105","atempt to create database");
-define("_INSTALL_L106","Could not connect to the database server.");
-define("_INSTALL_L107","Please check the database server and its configuration.");
-define("_INSTALL_L108","Connection to database server is OK.");
-define("_INSTALL_L109","Database %s does not exists.");
-define("_INSTALL_L110","Database %s exists and connectable.");
-define("_INSTALL_L111","Database connection is OK.<br />Press the button below to create database tables.");
-define("_INSTALL_L112","admin user setting");
-define("_INSTALL_L113","Table %s deleted.");
-define("_INSTALL_L114","Failed creating database tables.");
-define("_INSTALL_L115","Database tables created.");
-define("_INSTALL_L116","insert data");
-define("_INSTALL_L117","finish");
-
-define("_INSTALL_L118","Failed creating table %s.");
-define("_INSTALL_L119","%d entries inserted to table %s.");
-define("_INSTALL_L120","Failed inserting %d entries to table %s.");
-
-define("_INSTALL_L121","Constant %s written to %s.");
-define("_INSTALL_L122","Failed writing constant %s.");
-
-define("_INSTALL_L123","File %s stored in cache/ directory.");
-define("_INSTALL_L124","Failed storing file %s to cache/ directory.");
-
-define("_INSTALL_L125","File %s overwritten by %s.");
-define("_INSTALL_L126","Could not write to file %s.");
-
-define("_INSTALL_L130","The installer has detected tables for XOOPS 1.3.x in your database.<br />The installer will now attempt to upgrade your database to XOOPS2.");
-define("_INSTALL_L131","Tables for XOOPS2 already exist in your database.");
-define("_INSTALL_L132","update tables");
-define("_INSTALL_L133","Table %s updated.");
-define("_INSTALL_L134","Failed updating table %s.");
-define("_INSTALL_L135","Failed updating database tables.");
-define("_INSTALL_L136","Database tables updated.");
-define("_INSTALL_L137","update modules");
-define("_INSTALL_L138","update comments");
-define("_INSTALL_L139","update avatars");
-define("_INSTALL_L140","update smilies");
-define("_INSTALL_L141","The installer will now update each module to work with XOOPS2.<br />Make sure that you have uploaded all files in XOOPS2 package to your server.<br />This may take a while to complete.");
-define("_INSTALL_L142","Updating modules..");
-define("_INSTALL_L143","The installer will now update configuration data of XOOPS 1.3.x to be used with XOOPS2.");
-define("_INSTALL_L144","update config");
-define("_INSTALL_L145","Comment (ID: %s) inserted to the database.");
-define("_INSTALL_L146","Could not insert comment (ID: %s) to the database.");
-define("_INSTALL_L147","Updating comments..");
-define("_INSTALL_L148","Update complete.");
-define("_INSTALL_L149","The installer will now update comment posts in XOOPS 1.3.x to be used in XOOPS2.<br />This may take a while to complete.");
-define("_INSTALL_L150","The installer will now update the smiley and user rank images to be used with XOOPS2.<br />This may take a while to complete.");
-define("_INSTALL_L151","The installer will now update the user avatar images to be used in XOOPS2.<br />This may take a while to complete.");
-define("_INSTALL_L155","Updating smiley/rank images..");
-define("_INSTALL_L156","Updating user avatar images..");
-define("_INSTALL_L157","Select the default user group for each group type");
-define("_INSTALL_L158","Groups in 1.3.x");
-define("_INSTALL_L159","Webmasters");
-define("_INSTALL_L160","Register Users");
-define("_INSTALL_L161","Anonymous Users");
-define("_INSTALL_L162","You must select a default group for each group type.");
-define("_INSTALL_L163","Table %s dropped.");
-define("_INSTALL_L164","Failed deleting table %s.");
-define("_INSTALL_L165","The site is currently closed for maintainance. Please come back later.");
+define("_INSTALL_L80", "introduction");
+define("_INSTALL_L81", "check file permissions");
+define("_INSTALL_L82", "Checking file and directory permissions..");
+define("_INSTALL_L83", "File %s is NOT writable.");
+define("_INSTALL_L84", "File %s is writable.");
+define("_INSTALL_L85", "Directory %s is NOT writable.");
+define("_INSTALL_L86", "Directory %s is writable.");
+define("_INSTALL_L87", "No errors detected.");
+define("_INSTALL_L89", "general settings");
+define("_INSTALL_L90", "General configuration");
+define("_INSTALL_L91", "confirm");
+define("_INSTALL_L92", "save settings");
+define("_INSTALL_L93", "modify settings");
+define("_INSTALL_L88", "Saving configuration data..");
+define("_INSTALL_L94", "check path & URL");
+define("_INSTALL_L127", "Checking file path & URL settings..");
+define("_INSTALL_L95", "Could not detect the physical path to your XOOPS directory.");
+define("_INSTALL_L96", "There is a conflict between the detected physical path (%s) and the one you input.");
+define("_INSTALL_L97", "<b>Physical path</b> is correct.");
+
+define("_INSTALL_L99", "<b>Physical path</b> must be a directory.");
+define("_INSTALL_L100", "<b>Virtual path</b> is a valid URL.");
+define("_INSTALL_L101", "<b>Virtual path</b> is not a valid URL.");
+define("_INSTALL_L102", "confirm database settings");
+define("_INSTALL_L103", "restart from the beginning");
+define("_INSTALL_L104", "check database");
+define("_INSTALL_L105", "atempt to create database");
+define("_INSTALL_L106", "Could not connect to the database server.");
+define("_INSTALL_L107", "Please check the database server and its configuration.");
+define("_INSTALL_L108", "Connection to database server is OK.");
+define("_INSTALL_L109", "Database %s does not exists.");
+define("_INSTALL_L110", "Database %s exists and connectable.");
+define("_INSTALL_L111", "Database connection is OK.<br />Press the button below to create database tables.");
+define("_INSTALL_L112", "admin user setting");
+define("_INSTALL_L113", "Table %s deleted.");
+define("_INSTALL_L114", "Failed creating database tables.");
+define("_INSTALL_L115", "Database tables created.");
+define("_INSTALL_L116", "insert data");
+define("_INSTALL_L117", "finish");
+
+define("_INSTALL_L118", "Failed creating table %s.");
+define("_INSTALL_L119", "%d entries inserted to table %s.");
+define("_INSTALL_L120", "Failed inserting %d entries to table %s.");
+
+define("_INSTALL_L121", "Constant %s written to %s.");
+define("_INSTALL_L122", "Failed writing constant %s.");
+
+define("_INSTALL_L123", "File %s stored in cache/ directory.");
+define("_INSTALL_L124", "Failed storing file %s to cache/ directory.");
+
+define("_INSTALL_L125", "File %s overwritten by %s.");
+define("_INSTALL_L126", "Could not write to file %s.");
+
+define("_INSTALL_L130", "The installer has detected tables for XOOPS 1.3.x in your database.<br />The installer will now attempt to upgrade your database to XOOPS2.");
+define("_INSTALL_L131", "Tables for XOOPS2 already exist in your database.");
+define("_INSTALL_L132", "update tables");
+define("_INSTALL_L133", "Table %s updated.");
+define("_INSTALL_L134", "Failed updating table %s.");
+define("_INSTALL_L135", "Failed updating database tables.");
+define("_INSTALL_L136", "Database tables updated.");
+define("_INSTALL_L137", "update modules");
+define("_INSTALL_L138", "update comments");
+define("_INSTALL_L139", "update avatars");
+define("_INSTALL_L140", "update smilies");
+define("_INSTALL_L141", "The installer will now update each module to work with XOOPS2.<br />Make sure that you have uploaded all files in XOOPS2 package to your server.<br />This may take a while to complete.");
+define("_INSTALL_L142", "Updating modules..");
+define("_INSTALL_L143", "The installer will now update configuration data of XOOPS 1.3.x to be used with XOOPS2.");
+define("_INSTALL_L144", "update config");
+define("_INSTALL_L145", "Comment (ID: %s) inserted to the database.");
+define("_INSTALL_L146", "Could not insert comment (ID: %s) to the database.");
+define("_INSTALL_L147", "Updating comments..");
+define("_INSTALL_L148", "Update complete.");
+define("_INSTALL_L149", "The installer will now update comment posts in XOOPS 1.3.x to be used in XOOPS2.<br />This may take a while to complete.");
+define("_INSTALL_L150", "The installer will now update the smiley and user rank images to be used with XOOPS2.<br />This may take a while to complete.");
+define("_INSTALL_L151", "The installer will now update the user avatar images to be used in XOOPS2.<br />This may take a while to complete.");
+define("_INSTALL_L155", "Updating smiley/rank images..");
+define("_INSTALL_L156", "Updating user avatar images..");
+define("_INSTALL_L157", "Select the default user group for each group type");
+define("_INSTALL_L158", "Groups in 1.3.x");
+define("_INSTALL_L159", "Webmasters");
+define("_INSTALL_L160", "Register Users");
+define("_INSTALL_L161", "Anonymous Users");
+define("_INSTALL_L162", "You must select a default group for each group type.");
+define("_INSTALL_L163", "Table %s dropped.");
+define("_INSTALL_L164", "Failed deleting table %s.");
+define("_INSTALL_L165", "The site is currently closed for maintainance. Please come back later.");
 
 // %s is filename
-define("_INSTALL_L152","Could not open %s.");
-define("_INSTALL_L153","Could not update %s.");
-define("_INSTALL_L154","%s updated.");
+define("_INSTALL_L152", "Could not open %s.");
+define("_INSTALL_L153", "Could not update %s.");
+define("_INSTALL_L154", "%s updated.");
 
 define('_INSTALL_L128', 'Choose language to be used for the installation process');
 define('_INSTALL_L200', 'Reload');
 
 
-define('_INSTALL_CHARSET','ISO-8859-1');
-define('_MU_UPDATE','Upgrade EFQ Directory');
+define('_INSTALL_CHARSET', 'ISO-8859-1');
+define('_MU_UPDATE', 'Upgrade EFQ Directory');
 ?>
\ No newline at end of file

submit.php

Indentation +5 added lines, -5 removed lines

@@ -38,17 +38,17 @@ 
 
 $moddir = $xoopsModule->getVar('dirname');
 if (isset($_POST["dirid"])) {
-    $dirid = intval($_POST["dirid"]);
+	$dirid = intval($_POST["dirid"]);
 } else if (isset($_GET["dirid"])) {
-    $dirid = intval($_GET["dirid"]);
+	$dirid = intval($_GET["dirid"]);
 }
 
 $eh = new ErrorHandler; //ErrorHandler object
 
 if (isset($_GET["op"])) {
-    $op =  $_GET["op"];
+	$op =  $_GET["op"];
 } else if (isset($_POST["op"])) {
-    $op =  $_POST["op"];
+	$op =  $_POST["op"];
 }
 
 if (empty($xoopsUser) and !$xoopsModuleConfig['anonpost']) {
@@ -81,7 +81,7 @@ 
 	$allcatsresult = $xoopsDB->query("SELECT cid FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE dirid='".$dirid."' AND active='1'");
 	$numrows = $xoopsDB->getRowsNum($allcatsresult);
 	$count = 0;
-    if ( $numrows > 0 ) {
+	if ( $numrows > 0 ) {
 		while(list($cid) = $xoopsDB->fetchRow($allcatsresult)) {
 			if (isset($_POST["selected".$cid.""])) {
 				$sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')", $xoopsDB->prefix("efqdiralpha1_item_x_cat"), $newid, $cid, $itemid, 1, time());

Spacing +20 added lines, -20 removed lines

@@ -30,7 +30,7 @@ 
 //	Based upon the mylinks and the mxDirectory modules						 //
 // ------------------------------------------------------------------------- //
 include "header.php";
-$myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
 include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
 include_once XOOPS_ROOT_PATH."/class/module.errorhandler.php";
 include_once XOOPS_ROOT_PATH."/include/xoopscodes.php";
@@ -46,13 +46,13 @@ 
 $eh = new ErrorHandler; //ErrorHandler object
 
 if (isset($_GET["op"])) {
-    $op =  $_GET["op"];
+    $op = $_GET["op"];
 } else if (isset($_POST["op"])) {
-    $op =  $_POST["op"];
+    $op = $_POST["op"];
 }
 
 if (empty($xoopsUser) and !$xoopsModuleConfig['anonpost']) {
-	redirect_header(XOOPS_URL."/user.php",2,_MD_MUSTREGFIRST);
+	redirect_header(XOOPS_URL."/user.php", 2, _MD_MUSTREGFIRST);
 	exit();
 }
 
@@ -65,7 +65,7 @@ 
 	$title = $myts->makeTboxData4Save($_POST["title"]);
 	$date = time();
 	$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_items")."_itemid_seq");
-	if ( $xoopsModuleConfig['autoapprove'] == 1 or $xoopsModuleConfig['autoapproveadmin'] == 1 ) {
+	if ($xoopsModuleConfig['autoapprove'] == 1 or $xoopsModuleConfig['autoapproveadmin'] == 1) {
 		$status = 1;
 	} else {
 		$status = 0;
@@ -81,20 +81,20 @@ 
 	$allcatsresult = $xoopsDB->query("SELECT cid FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE dirid='".$dirid."' AND active='1'");
 	$numrows = $xoopsDB->getRowsNum($allcatsresult);
 	$count = 0;
-    if ( $numrows > 0 ) {
-		while(list($cid) = $xoopsDB->fetchRow($allcatsresult)) {
+    if ($numrows > 0) {
+		while (list($cid) = $xoopsDB->fetchRow($allcatsresult)) {
 			if (isset($_POST["selected".$cid.""])) {
 				$sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')", $xoopsDB->prefix("efqdiralpha1_item_x_cat"), $newid, $cid, $itemid, 1, time());
 				$xoopsDB->query($sql) or $eh->show("0013");
-				$count ++;
+				$count++;
 			}
 		}
 		if ($count == 0) {
-			redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid."",2,_MD_NOCATEGORYMATCH);
+			redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid."", 2, _MD_NOCATEGORYMATCH);
 			exit();
 		}
 	} else {
-		redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid."",2,_MD_NOCATEGORIESAVAILABLE);
+		redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid."", 2, _MD_NOCATEGORIESAVAILABLE);
 		exit();
 	}
 	
@@ -117,13 +117,13 @@ 
 		redirect_header(XOOPS_URL."/modules/$moddir/edit.php?item=".$itemid."",2,_MD_SAVED);
 	}*/
 	
-	redirect_header(XOOPS_URL."/modules/$moddir/edit.php?item=".$itemid."",2,_MD_SAVED);
+	redirect_header(XOOPS_URL."/modules/$moddir/edit.php?item=".$itemid."", 2, _MD_SAVED);
 	exit();
 } else {
 	if (isset($_GET['dirid'])) {
 		$get_dirid = intval($_GET['dirid']);
 	} else {
-		redirect_header(XOOPS_URL."/modules/$moddir/index.php",2,_MD_NODIRECTORYSELECTED);
+		redirect_header(XOOPS_URL."/modules/$moddir/index.php", 2, _MD_NODIRECTORYSELECTED);
 	}
 	$xoopsOption['template_main'] = 'efqdiralpha1_submit.html';
 	include XOOPS_ROOT_PATH."/header.php";
@@ -132,17 +132,17 @@ 
 	ob_start();
 	$form = new XoopsThemeForm(_MD_SUBMITLISTING_FORM, 'submitform', 'submit.php');
 	$form->setExtra('enctype="multipart/form-data"');
-	$editor = !empty($_REQUEST['editor'])?$_REQUEST['editor']:"";
-	if(!empty($editor)){
-		setcookie("editor",$editor); // save to cookie
-	}else
+	$editor = !empty($_REQUEST['editor']) ? $_REQUEST['editor'] : "";
+	if (!empty($editor)) {
+		setcookie("editor", $editor); // save to cookie
+	} else
 	// Or use user pre-selected editor through profile
-	if(is_object($xoopsUser)){
-		$editor =@ $xoopsUser->getVar("editor"); // Need set through user profile
+	if (is_object($xoopsUser)) {
+		$editor = @ $xoopsUser->getVar("editor"); // Need set through user profile
 	}
 	$editor = "koivi";
-	$options['name'] ='link_description';
-	$options['value'] = empty($_REQUEST['message'])?"":$_REQUEST['message'];
+	$options['name'] = 'link_description';
+	$options['value'] = empty($_REQUEST['message']) ? "" : $_REQUEST['message'];
 	$options['value'] = "";
 	//optional configs
 	$options['rows'] = 25; // default value = 5

Braces +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	$editor = !empty($_REQUEST['editor'])?$_REQUEST['editor']:"";
 	if(!empty($editor)){
 		setcookie("editor",$editor); // save to cookie
-	}else
+	} else
 	// Or use user pre-selected editor through profile
 	if(is_object($xoopsUser)){
 		$editor =@ $xoopsUser->getVar("editor"); // Need set through user profile

ipn.php

Switch Indentation +15 added lines, -15 removed lines

@@ -28,33 +28,33 @@
 //decide which post method to use
 switch($paypal['post_method']) { 
 
-case "libCurl": //php compiled with libCurl support
+	case "libCurl": //php compiled with libCurl support
 
-$result=libCurlPost($paypal['url'],$_POST); 
+	$result=libCurlPost($paypal['url'],$_POST); 
 
 
-break;
+	break;
 
 
-case "curl": //cURL via command line
+	case "curl": //cURL via command line
 
-$result=curlPost($paypal['url'],$_POST); 
-//print_r($result);
-break; 
+	$result=curlPost($paypal['url'],$_POST); 
+	//print_r($result);
+	break; 
 
 
-case "fso": //php fsockopen(); 
+	case "fso": //php fsockopen(); 
 
-$result=fsockPost($paypal['url'],$_POST); 
-//print_r($result);
-break; 
+	$result=fsockPost($paypal['url'],$_POST); 
+	//print_r($result);
+	break; 
 
 
-default: //use the fsockopen method as default post method
+	default: //use the fsockopen method as default post method
 
-$result=fsockPost($paypal['url'],$_POST);
-//print_r($result);
-break;
+	$result=fsockPost($paypal['url'],$_POST);
+	//print_r($result);
+	break;
 
 }
 

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
  */
 include "header.php";
 include_once XOOPS_ROOT_PATH."/class/module.errorhandler.php";
-$myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
 
 include_once 'class/class.subscription.php';
 
@@ -26,11 +26,11 @@ 
 
 
 //decide which post method to use
-switch($paypal['post_method']) { 
+switch ($paypal['post_method']) { 
 
 case "libCurl": //php compiled with libCurl support
 
-$result=libCurlPost($paypal['url'],$_POST); 
+$result = libCurlPost($paypal['url'], $_POST); 
 
 
 break;
@@ -38,21 +38,21 @@ 
 
 case "curl": //cURL via command line
 
-$result=curlPost($paypal['url'],$_POST); 
+$result = curlPost($paypal['url'], $_POST); 
 //print_r($result);
 break; 
 
 
 case "fso": //php fsockopen(); 
 
-$result=fsockPost($paypal['url'],$_POST); 
+$result = fsockPost($paypal['url'], $_POST); 
 //print_r($result);
 break; 
 
 
 default: //use the fsockopen method as default post method
 
-$result=fsockPost($paypal['url'],$_POST);
+$result = fsockPost($paypal['url'], $_POST);
 //print_r($result);
 break;
 
@@ -61,7 +61,7 @@ 
 
 //check the ipn result received back from paypal
 
-if(eregi("VERIFIED",$result)) {
+if (eregi("VERIFIED", $result)) {
 	// Automatic update of the subscription is not yet included in the success page.
 	// This will need to be done manually.
 	include_once('ipn/ipn_success.php'); 

ipn/ipn_error.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 // this is an include file - no functionality when
 // called directly
 
-if(isset($paypal['business']))
+if (isset($paypal['business']))
 {
 //log error to file or database
 	echo "some kind of error occurred.";

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 {
 //log error to file or database
 	echo "some kind of error occurred.";
-}
-else
+} else
 {
 	die('This page is not directly accessible');
 }