Commit 2ab8f74c1e7067f89490de822f51d619646ec881

Authored by Péter Szládovics
1 parent 8bebb2c9

Sorting records

config/config.php
1 1 <?php
2   -$_CONF['db_type'] = '';
3   -$_CONF['db_user'] = '';
4   -$_CONF['db_pass'] = '';
5   -$_CONF['db_host'] = '';
6   -$_CONF['db_port'] = '';
7   -$_CONF['db_db'] = '';
8   -$_CONF['smarty_path'] = '';
9   -$_CONF['peardb_path'] = '';
  2 +$_CONF['db_type'] = 'mysqli';
  3 +$_CONF['db_user'] = 'smbind';
  4 +$_CONF['db_pass'] = 'smbind';
  5 +$_CONF['db_host'] = '10.21.32.7';
  6 +$_CONF['db_port'] = '3306';
  7 +$_CONF['db_db'] = 'smbind';
  8 +$_CONF['smarty_path'] = '/usr/share/php/smarty3/';
  9 +$_CONF['peardb_path'] = '/usr/share/php';
  10 +$_CONF['title'] = 'MyOnline Primary NS management';
  11 +$_CONF['footer'] = '<b>PRIMARY site</b> - Switch to <a class=attention href="https://service.myonline.hu/dnsslave/"><b>SECONDARY site</b></a> | You are from: <b>' . $_SERVER['REMOTE_ADDR'] . '</b>';
  12 +$_CONF['recaptcha'] = true;
  13 +$_CONF['rc_pubkey'] = '6LectQcTAAAAAGLTGJQpjM8eh8YEozuXYFqpLDqG';
  14 +$_CONF['rc_privkey'] = '6LectQcTAAAAAGBDl7u5lrbVQmNYtlF37K2RkArR';
  15 +$_CONF['nocaptcha'] = array (
  16 + '78.131.57.83',
  17 + );
  18 +$_CONF['path'] = '/etc/smbind/zones/';
  19 +$_CONF['conf'] = '/etc/smbind/smbind.conf';
  20 +$_CONF['rollerconf'] = '/etc/smbind/rollrec/zones.rollrec';
10 21 ?>
... ...
config/config.php-default 0 → 100644
  1 +# Required parts
  2 +<?php
  3 +$_CONF['db_type'] = '';
  4 +$_CONF['db_user'] = '';
  5 +$_CONF['db_pass'] = '';
  6 +$_CONF['db_host'] = '';
  7 +$_CONF['db_port'] = '';
  8 +$_CONF['db_db'] = '';
  9 +$_CONF['smarty_path'] = '';
  10 +$_CONF['peardb_path'] = '';
  11 +?>
... ...
lib/smbind.class.php
... ... @@ -1722,7 +1722,7 @@
1722 1722  
1723 1723 public function loadZoneRecords() {
1724 1724 if ($this->is_complete()) {
1725   - $res = $this->db->query("SELECT id FROM records WHERE zone = " . $this->head['id']);
  1725 + $res = $this->db->query("SELECT id FROM records WHERE zone = " . $this->head['id'] . " ORDER BY type,host");
1726 1726 if (MDB2::isError($res)) {
1727 1727 $this->err .= $res->getMessage() . "\n" . $res->getDebugInfo();
1728 1728 error_log($this->err);
... ...