supernova-ws / SuperNova

classes/template.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -586,7 +586,7 @@ 
       // Search array to get correct position
       list($search_key, $search_value) = @each($key);
 
-      $key = NULL;
+      $key = null;
       foreach ($this->_tpldata[$blockname] as $i => $val_ary)
       {
         if ($val_ary[$search_key] === $search_value)
@@ -597,7 +597,7 @@ 
       }
 
       // key/value pair not found
-      if ($key === NULL)
+      if ($key === null)
       {
         return false;
       }

messages.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
         if($query_add) {
           $query_add = "IN ({$query_add})";
           if($message_range == 'unchecked') {
-            $query_add = "NOT {$query_add}";
+            $query_add = "not {$query_add}";
           }
           $query_add = " AND `message_id` {$query_add}";
         }

classes/classPersistent.php

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
     $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null)));
   }
 
-  public function db_saveItem($item_list, $value = NULL) {
+  public function db_saveItem($item_list, $value = null) {
     if(empty($item_list)) {
       return;
     }
@@ -91,7 +91,7 @@ 
     $qry = array();
     foreach($item_list as $item_name => $item_value) {
       if($item_name) {
-        $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value);
+        $item_value = db_escape($item_value === null ? $this->$item_name : $item_value);
         $item_name = db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
       }
@@ -100,7 +100,7 @@ 
 
     // И только после взятия блокировок - меняем значения в кэше
     foreach($item_list as $item_name => $item_value) {
-      if($item_name && $item_value !== NULL) {
+      if($item_name && $item_value !== null) {
         $this->$item_name = $item_value;
       }
     }

classes/debug.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
-    $result[] = "tID {$transaction_id}";
+    $result[] = "tid {$transaction_id}";
     foreach($backtrace as $a_trace) {
       if(in_array($a_trace['function'], $exclude_functions)) {
         continue;

classes/classCache.php

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -150,7 +150,7 @@ 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
     !$array_clear ? $array_clear = function(&$v,$k,$p) {
-      strpos($k, $p) === 0 ? $v = NULL : false;
+      strpos($k, $p) === 0 ? $v = null : false;
     } : false;
 
     switch (self::$mode) {
@@ -196,14 +196,14 @@ 
     $name = $this->make_element_name($args, 1);
 
     if(!$name) {
-      return NULL;
+      return null;
     }
 
-    if($this->$name[0] === NULL) {
+    if($this->$name[0] === null) {
       for($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
         $cName1 = "{$name[$i-1]}_COUNT";
-        if($this->$cName1 == NULL || $i == 1) {
+        if($this->$cName1 == null || $i == 1) {
           $this->$cName++;
         }
       }
@@ -216,7 +216,7 @@ 
   public function array_get() {
     $name = $this->make_element_name(func_get_args());
     if(!$name) {
-      return NULL;
+      return null;
     }
     return $this->$name[0];
   }
@@ -229,7 +229,7 @@ 
     $cName = "{$name[0]}_COUNT";
     $retVal = $this->$cName;
     if(!$retVal) {
-      $retVal = NULL;
+      $retVal = null;
     }
     return $retVal;
   }
@@ -246,7 +246,7 @@ 
       $cName = "{$name[$i]}_COUNT";
       $cName1 = "{$name[$i-1]}_COUNT";
 
-      if($i == 1 || $this->$cName1 === NULL) {
+      if($i == 1 || $this->$cName1 === null) {
         $this->$cName--;
         if($this->$cName <= 0) {
           unset($this->$cName);

includes/general.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -283,7 +283,7 @@
  */
 function sys_get_param($param_name, $default = '')
 {
-  return $_POST[$param_name] !== NULL ? $_POST[$param_name] : ($_GET[$param_name] !== NULL ? $_GET[$param_name] : $default);
+  return $_POST[$param_name] !== null ? $_POST[$param_name] : ($_GET[$param_name] !== null ? $_GET[$param_name] : $default);
 }
 
 function sys_get_param_id($param_name, $default = 0)

includes/functions/int_fleet_events.php

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -89,18 +89,18 @@ 
     case 0:
       $fleet['event_time'] = $fleet['fleet_start_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
     case 1:
       $fleet['event_time'] = $fleet['fleet_end_stay'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
@@ -108,9 +108,9 @@ 
     case 3:
       $fleet['event_time'] = $fleet['fleet_end_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_start_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_start_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_start_system']) and
+        ($planetrow['planet'] == $fleet['fleet_start_planet']) and
         ($planetrow['planet_type'] == $fleet['fleet_start_type']));
     break;
 

includes/includes/flt_mission_recycle.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
   }
   else
   {
-    if (($destination_planet["debris_metal"]   > $RecyclerCapacity / 2) AND
+    if (($destination_planet["debris_metal"]   > $RecyclerCapacity / 2) and
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2))
       {
       $RecycledGoods["metal"]   = $RecyclerCapacity / 2;

includes/includes/upd_helpers.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
 function upd_db_unit_by_location($user_id = 0, $location_type, $location_id, $unit_snid = 0, $for_update = false, $fields = '*') {
   return db_fetch(upd_do_query(
-    "SELECT {$fields}
+    "select {$fields}
     FROM {{unit}}
     WHERE
       `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() .