rdorado / site-analyzer

src/SiteAnalyzer.php

Braces +6 added lines, -12 removed lines

@@ -30,20 +30,17 @@ 
         
         if(array_key_exists('pdo',$options)){            
             $pdo = $options['pdo'];	
-        }
-        else{            
+        } else{            
             $pdo = Persistence::getPDO($config);
         }
         
         try{
             return Persistence::updateCount($pdo,$config,$options);
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             try{
                 Persistence::crateDatabase($pdo, $config);
                 return Persistence::updateCount($pdo,$config,$options);
-            }
-            catch(Exception $e) {
+            } catch(Exception $e) {
                 throw new Exception("Site Analyzer could connect to the database.".$e->getMessage());
             };
             
@@ -60,12 +57,10 @@ 
         $config = NULL;
         try{
             $config = new Configuration("../../../../site-analyzer.ini",$pdoProvided);
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             try{
                 $config = new Configuration("site-analyzer.ini",$pdoProvided); 
-            }
-            catch(Exception $e){
+            } catch(Exception $e){
                 throw Exception("Config file not found.");
             }
         }
@@ -126,8 +121,7 @@ 
         foreach ($data as $row){
             if(array_key_exists($row['user'],$count)){
                 $count[$row['user']]++;
-            }
-            else{
+            } else{
                 $count[$row['user']]=1;
             }            
         }

src/Persistence.php

Braces +23 added lines, -46 removed lines

@@ -35,8 +35,7 @@ 
         if($config->getDsn()){
             try{
                 return new PDO($config->getDsn(),$config->getUser(),$config->getPassword(),$options);
-            }
-            catch(Exception $e){                
+            } catch(Exception $e){                
                 if(!$config->getUseOnMemoryDB()){
                     throw new Exception("Could not create a db connection. Check permissions, configuration, and documentation. ".$e->getMessage());
                 }
@@ -46,8 +45,7 @@ 
         if($config->getUseOnMemoryDB()){
             try{
                 return new PDO("sqlite::memory:",$options);
-            }
-            catch(Exception $e){
+            } catch(Exception $e){
                 throw new Exception("Could not create a db connection. Check permissions, configuration, and documentation. ".$e->getMessage());                
             }
         }
@@ -77,8 +75,7 @@ 
             $stmt->execute();
             $stmt = $pdo->prepare("CREATE TABLE $db_url_table (id VARCHAR(255), url VARCHAR(255), count INT)");
             $stmt->execute();
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Could not create the database. ".$e->getMessage());
         }        
         return true;
@@ -119,8 +116,7 @@ 
             $stmt = $pdo->prepare("DROP TABLE $tableName");
             $stmt->execute();
            
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Problem deleting the table $tableName. ".$e->getMessage());
         }
         return true;
@@ -140,8 +136,7 @@ 
             $resp = $resp && Persistence::checkOptionsTable($pdo, $config);
             $resp = $resp && Persistence::checkFromTable($pdo, $config);
             $resp = $resp && Persistence::checkUrlTable($pdo, $config);
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }        
         return $resp;
@@ -158,8 +153,7 @@ 
             $stmt = $pdo->prepare("SELECT * FROM $db_from_table WHERE 1==0");
             $stmt->execute();
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;
@@ -174,8 +168,7 @@ 
             $db_url_table = $config->getUrlTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_url_table WHERE 1==0");
             $stmt->execute();            
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;
@@ -192,8 +185,7 @@ 
             $db_options_table = $config->getOptionsTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_options_table WHERE 1==0");
             $stmt->execute();
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;
@@ -208,8 +200,7 @@ 
             $db_hit_table = $config->getHitTableName();
             $stmt = $pdo->prepare("SELECT * FROM $db_hit_table WHERE 1==0");
             $stmt->execute();            
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             return false;
         }
         return true;        
@@ -234,14 +225,12 @@ 
         
         if(array_key_exists('url', $options)){
             $url = $options['url'];
-        }
-        else if(array_key_exists('HTTP_HOST',$_SERVER)){
+        } else if(array_key_exists('HTTP_HOST',$_SERVER)){
             $url = "http://".$_SERVER['HTTP_HOST'];
             if(array_key_exists('REQUEST_URI',$_SERVER)){
                 $url=$url.$_SERVER['REQUEST_URI'];
             }               
-        }
-        else{
+        } else{
             $url = "No Info";
         }
 
@@ -251,8 +240,7 @@ 
         
         if(array_key_exists('id', $options)){
             $id = $options['id'];
-        }
-        else{
+        } else{
             $id = $url;
         }
 
@@ -275,8 +263,7 @@ 
                         
             if(array_key_exists('from_id', $options)){
                 $ids = [$options['from_id']];
-            }
-            else{
+            } else{
                 $from_url = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 'No referer info';
                 $ids = Persistence::findHitIdsByUrl($pdo,$config,$from_url); 
                 if(count($ids)==0){
@@ -326,8 +313,7 @@ 
                     $resp[] = $row['id'];
                 }
             }
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'findHitsByUrl'. ".$e->getMessage());
         }
         return $resp;
@@ -352,8 +338,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'getAllHits'. ".$e->getMessage());
         }
         return $resp;        
@@ -393,8 +378,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'getAllUrls'. ".$e->getMessage());
         }
         return $resp;
@@ -438,8 +422,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'getAllUrls'. ".$e->getMessage());
         }
         return $resp;
@@ -462,16 +445,13 @@ 
             if(array_key_exists('url',$by) && array_key_exists('id',$by)){
                 $qdata = [$by['url'], $by['id']];
                 $tquery = "SELECT f.* FROM  $dbFromtable f,$dbUrltable u WHERE (f.from_id = u.id and f.url = ?) or f.from_id = ?";                
-            }
-            else if(array_key_exists('url',$by)){
+            } else if(array_key_exists('url',$by)){
                 $qdata = [$by['url']];
                 $tquery = "SELECT f.* FROM $dbFromtable f,$dbUrltable u where f.from_id = u.id and u.url = ?";
-            }
-            else if(array_key_exists('id',$by)){
+            } else if(array_key_exists('id',$by)){
                 $qdata = [$by['id']];
                 $tquery = "SELECT f.* FROM $dbFromtable f where f.from_id = ?";
-            }
-            else{
+            } else{
                 $qdata = [];
                 $tquery = "SELECT f.* FROM $dbFromtable f";
             }
@@ -483,8 +463,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error executing function 'findByFrom'. ".$e->getMessage());
         }
         return $resp;
@@ -511,8 +490,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error reading the database. Method getCounts().".$e->getMessage());
         }        
         return $resp;
@@ -536,8 +514,7 @@ 
                 }
             }
             
-        }
-        catch(Exception $e){
+        } catch(Exception $e){
             throw new Exception("Error reading the database. Method getCounts().".$e->getMessage());
         }
         return $resp;