supernova-ws / SuperNova

includes/classes/DBStaticPlanet.php

Doc Comments +14 added lines

@@ -21,11 +21,19 @@ 
     return empty($result) ? null : $result;
   }
 
+  /**
+   * @param integer $galaxy
+   * @param integer $system
+   * @param integer $planet
+   */
   public static function db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') {
     return classSupernova::db_get_record_list(LOC_PLANET,
       "{{planets}}.`galaxy` = {$galaxy} AND {{planets}}.`system` = {$system} AND {{planets}}.`planet` = {$planet} AND {{planets}}.`planet_type` = {$planet_type}", true);
   }
 
+  /**
+   * @param integer $planet_type
+   */
   public static function db_planet_by_gspt($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') {
     $galaxy = intval($galaxy);
     $system = intval($system);
@@ -120,6 +128,9 @@ 
       "`id_owner` = '{$user_row['id']}' {$conditions} ORDER BY {$order_by}");
   }
 
+  /**
+   * @param integer $planet_id
+   */
   public static function db_planet_list_by_user_or_planet($user_id, $planet_id) {
     if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
       return false;
@@ -138,6 +149,9 @@ 
     return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set);
   }
 
+  /**
+   * @param integer $ui_planet_type
+   */
   public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) {
     if(!($set = trim($set))) {
       return false;

Spacing +20 added lines, -21 removed lines

@@ -36,11 +36,10 @@ 
   }
 
   public static function db_planet_by_vector($vector, $prefix = '', $for_update = false, $fields = '*') {
-    $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
-    $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
-    $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $galaxy = isset($vector[$prefix.'galaxy']) ? intval($vector[$prefix.'galaxy']) : 0;
+    $system = isset($vector[$prefix.'system']) ? intval($vector[$prefix.'system']) : 0;
+    $planet = isset($vector[$prefix.'planet']) ? intval($vector[$prefix.'planet']) : 0;
+    $planet_type = isset($vector[$prefix.'planet_type']) ? intval($vector[$prefix.'planet_type']) : (isset($vector[$prefix.'type']) ? intval($vector[$prefix.'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);
@@ -61,17 +60,17 @@ 
   }
 
   public static function db_planet_by_parent($parent_id, $for_update = false, $fields = '*') {
-    if(!($parent_id = idval($parent_id))) {
+    if (!($parent_id = idval($parent_id))) {
       return false;
     }
 
     return classSupernova::db_get_record_list(LOC_PLANET,
-      "`parent_planet` = {$parent_id} AND `planet_type` = " . PT_MOON, true);
+      "`parent_planet` = {$parent_id} AND `planet_type` = ".PT_MOON, true);
   }
 
   public static function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*') {
     //if(!($planet_id = intval($planet_id)) || !($owner_id = intval($owner_id))) return false;
-    if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
+    if (!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
       return false;
     }
 
@@ -82,12 +81,12 @@ 
 
   public static function db_planet_list_moon_other($user_id, $this_moon_id) {
     // if(!($user_id = intval($user_id)) || !($this_moon_id = intval($this_moon_id))) return false;
-    if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
+    if (!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
       return false;
     }
 
     return classSupernova::db_get_record_list(LOC_PLANET,
-      "`planet_type` = " . PT_MOON . " AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
+      "`planet_type` = ".PT_MOON." AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
   }
 
   public static function db_planet_list_in_system($galaxy, $system) {
@@ -99,7 +98,7 @@ 
   }
 
   public static function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') {
-    if(!is_array($user_row)) {
+    if (!is_array($user_row)) {
       return false;
     }
     // $field_list = $field_list != '*' ? "{{planets}}.`id`, `name`, `image`, {{planets}}.`galaxy`, {{planets}}.`system`, {{planets}}.`planet`, `planet_type`{$field_list}" : $field_list;
@@ -113,7 +112,7 @@ 
     );
     $order_by = classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT];
     empty($sort_orders[$order_by]) ? $order_by = SORT_ID : false;
-    $order_by = $sort_orders[$order_by] . ' ' . (classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
+    $order_by = $sort_orders[$order_by].' '.(classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
 
     // Compilating query
     return classSupernova::db_get_record_list(LOC_PLANET,
@@ -121,7 +120,7 @@ 
   }
 
   public static function db_planet_list_by_user_or_planet($user_id, $planet_id) {
-    if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
+    if (!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
       return false;
     }
 
@@ -131,7 +130,7 @@ 
 
   public static function db_planet_set_by_id($planet_id, $set) {
     // if(!($planet_id = intval($planet_id))) return false;
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
 
@@ -139,7 +138,7 @@ 
   }
 
   public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) {
-    if(!($set = trim($set))) {
+    if (!($set = trim($set))) {
       return false;
     }
 
@@ -153,7 +152,7 @@ 
 
   public static function db_planet_set_by_parent($ui_parent_id, $ss_set) {
     //if(!($si_parent_id = intval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false;
-    if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
 
@@ -162,7 +161,7 @@ 
 
   public static function db_planet_set_by_owner($ui_owner_id, $ss_set) {
     //if(!($si_owner_id = intval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false;
-    if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
 
@@ -172,11 +171,11 @@ 
 
   public static function db_planet_delete_by_id($planet_id) {
     // if(!($planet_id = intval($planet_id))) return false;
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
     classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id);
-    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_location_id` = " . $planet_id);
+    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = ".LOC_PLANET." AND `unit_location_id` = ".$planet_id);
 
     // Очереди очистятся автоматически по FOREIGN KEY
     return true;
@@ -184,11 +183,11 @@ 
 
   public static function db_planet_list_delete_by_owner($ui_owner_id) {
     // if(!($si_owner_id = intval($ui_owner_id))) return false;
-    if(!($si_owner_id = idval($ui_owner_id))) {
+    if (!($si_owner_id = idval($ui_owner_id))) {
       return false;
     }
     classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}");
-    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_player_id` = " . $si_owner_id);
+    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = ".LOC_PLANET." AND `unit_player_id` = ".$si_owner_id);
 
     // Очереди очистятся автоматически по FOREIGN KEY
     return true;

includes/classes/DBStaticUnit.php

Doc Comments +6 added lines

@@ -56,6 +56,9 @@ 
     WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
   }
 
+  /**
+   * @param string $set
+   */
   public static function db_unit_set_by_id($unit_id, $set) {
     return classSupernova::db_upd_record_by_id(LOC_UNIT, $unit_id, $set);
   }
@@ -69,6 +72,9 @@ 
     return classSupernova::db_ins_record(LOC_UNIT, $set);
   }
 
+  /**
+   * @param integer $unit_location_type
+   */
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
       "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}" .

Spacing +13 added lines, -13 removed lines

@@ -21,13 +21,13 @@ 
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
     $query = doquery(
-      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
-      ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
-      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
+      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
+      ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
+      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
       'GROUP BY `unit_snid`'
     );
     $result = array();
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['unit_snid']] = $row;
     }
 
@@ -43,8 +43,8 @@ 
     WHERE
       f.fleet_owner = {$user_id} AND
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() .
-      " LIMIT 1" .
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions().
+      " LIMIT 1".
       ($for_update ? ' FOR UPDATE' : '')
       , true);
   }
@@ -53,7 +53,7 @@ 
   public static function db_unit_list_laboratories($user_id) {
     return doquery("SELECT DISTINCT unit_location_id AS `id`
     FROM {{unit}}
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
   }
 
   public static function db_unit_set_by_id($unit_id, $set) {
@@ -71,8 +71,8 @@ 
 
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
-      "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}" .
-      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
+      "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}".
+      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
       ($unit_snid = idval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : ''));
   }
 
@@ -80,7 +80,7 @@ 
     return doquery(
       "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
     FROM `{{unit}}`
-    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() .
+    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions().
       " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
     );
   }
@@ -92,15 +92,15 @@ 
 
 
   public static function db_unit_list_admin_delete_mercenaries_finished() {
-    return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ") AND unit_type = " . UNIT_MERCENARIES);
+    return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.") AND unit_type = ".UNIT_MERCENARIES);
   }
 
   public static function db_unit_list_admin_set_mercenaries_expire_time($default_length) {
     return doquery(
       "UPDATE {{unit}}
     SET
-      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW . "),
-      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length) . ")
+      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW."),
+      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length).")
     WHERE unit_type = " . UNIT_MERCENARIES
     );
   }