fixed table name ou in backend & frontend

html/admin/groups/edit_group.php

@@ -19,9 +19,9 @@ if (isset($_POST['save'])) {
             $tmp_life_duration = str_replace(',', '.',$_POST['f_life_duration']*1);
             if (!empty($tmp_life_duration) and is_numeric($tmp_life_duration)) { $new['life_duration'] = $tmp_life_duration; }
             } else { $new['life_duration']=0; }
-        if ($new['default_users'] == TRUE) { run_sql($db_link,"UPDATE OU set default_users=0 WHERE id!='{$id}'"); }
-        if ($new['default_hotspot'] == TRUE) { run_sql($db_link,"UPDATE OU set default_hotspot=0 WHERE id!='{$id}'"); }
-        update_record($db_link, "OU", "id='{$id}'", $new);
+        if ($new['default_users'] == TRUE) { run_sql($db_link,"UPDATE ou set default_users=0 WHERE id!='{$id}'"); }
+        if ($new['default_hotspot'] == TRUE) { run_sql($db_link,"UPDATE ou set default_hotspot=0 WHERE id!='{$id}'"); }
+        update_record($db_link, "ou", "id='{$id}'", $new);
         header("Location: " . $_SERVER["REQUEST_URI"]);
 	exit;
 	}
@@ -84,7 +84,7 @@ fix_auth_rules($db_link);
 <td><b><?php print WEB_cell_dynamic; ?></b></td>
 </tr>
 <?php
-$ou_info = get_record_sql($db_link,'SELECT * FROM OU WHERE id='.$id);
+$ou_info = get_record_sql($db_link,'SELECT * FROM ou WHERE id='.$id);
 print "<tr align=center>\n";
 print "<td colspan=2 class=\"data\"><input type=\"text\" name='f_group_name' value='{$ou_info['ou_name']}' style=\"width:95%;\"></td>\n";
 if ($ou_info['default_users']) { $cl = "up"; } else { $cl="data"; }

html/admin/groups/index.php

@@ -9,7 +9,7 @@ if (isset($_POST["remove"])) {
             run_sql($db_link, "UPDATE user_list SET ou_id=0 WHERE ou_id=$val");
             run_sql($db_link, "UPDATE user_auth SET ou_id=0 WHERE ou_id=$val");
             run_sql($db_link, "DELETE FROM auth_rules WHERE ou_id=$val");
-            delete_record($db_link, "OU", "id=" . $val);
+            delete_record($db_link, "ou", "id=" . $val);
             }
         }
     header("Location: " . $_SERVER["REQUEST_URI"]);
@@ -20,7 +20,7 @@ if (isset($_POST["create"])) {
     $ou_name = $_POST["new_ou"];
     if (isset($ou_name)) {
         $new['ou_name'] = $ou_name;
-        insert_record($db_link, "OU", $new);
+        insert_record($db_link, "ou", $new);
         }
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
@@ -44,7 +44,7 @@ require_once ($_SERVER['DOCUMENT_ROOT']."/inc/header.php");
 </td>
 </tr>
 <?php
-$t_ou = get_records($db_link,'OU','TRUE ORDER BY ou_name');
+$t_ou = get_records($db_link,'ou','TRUE ORDER BY ou_name');
 foreach ($t_ou as $row) {
     print "<tr align=center>\n";
     print "<td class=\"data\" style='padding:0'><input type=checkbox name=f_id[] value='{$row['id']}'></td>\n";

html/admin/iplist/auto_rules.php

@@ -98,7 +98,7 @@ foreach ( $t_auth_rules as $row ) {
 	if (!empty($user_info)) { print "User: &nbsp"; print_url($user_info['login'],'/admin/users/edituser.php?id='.$user_info['id']); }
 	}
     if (!empty($row['ou_id'])) {
-	$ou_info=get_record_sql($db_link,"SELECT * FROM OU WHERE id=".$row['ou_id']);
+	$ou_info=get_record_sql($db_link,"SELECT * FROM ou WHERE id=".$row['ou_id']);
 	if (!empty($ou_info)) { print "Group: &nbsp"; print_url($ou_info['ou_name'],'/admin/groups/edit_group.php?id='.$ou_info['id']); }
 	}
     print "</td>";

html/admin/iplist/index.php

@@ -17,7 +17,7 @@ require_once ($_SERVER['DOCUMENT_ROOT']."/inc/dhcpfilter.php");
 $sort_table = 'user_auth';
 if ($sort_field == 'login') { $sort_table = 'user_list'; }
 if ($sort_field == 'fio') { $sort_table = 'user_list'; }
-if ($sort_field == 'ou_name') { $sort_table = 'OU'; }
+if ($sort_field == 'ou_name') { $sort_table = 'ou'; }
 
 $sort_url = "<a href=index.php?ou=" . $rou;
 
@@ -184,8 +184,8 @@ print_ip_submenu($page_url);
 $countSQL="SELECT Count(*) FROM user_auth
 LEFT JOIN user_list
 ON user_auth.user_id = user_list.id
-LEFT JOIN OU
-ON OU.id=user_list.ou_id
+LEFT JOIN ou
+ON ou.id=user_list.ou_id
 WHERE user_auth.deleted =0 $ip_list_filter";
 
 $count_records = get_single_field($db_link,$countSQL);
@@ -216,12 +216,12 @@ print_navigation($page_url,$page,$displayed,$count_records,$total);
         </tr>
 <?php
 
-$sSQL = "SELECT user_auth.*, user_list.login, user_list.enabled as UEnabled, user_list.blocked as UBlocked, OU.ou_name
+$sSQL = "SELECT user_auth.*, user_list.login, user_list.enabled as UEnabled, user_list.blocked as UBlocked, ou.ou_name
 FROM user_auth
 LEFT JOIN user_list
 ON user_auth.user_id = user_list.id
-LEFT JOIN OU
-ON OU.id=user_list.ou_id
+LEFT JOIN ou
+ON ou.id=user_list.ou_id
 WHERE user_auth.deleted =0 $ip_list_filter
 ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
 

html/admin/users/index.php

@@ -19,7 +19,7 @@ if (isset($_POST["create"])) {
         } else {
             $new['login'] = $login;
             $new['ou_id'] = $rou;
-            $ou_info = get_record_sql($db_link,"SELECT * FROM OU WHERE id=".$rou);
+            $ou_info = get_record_sql($db_link,"SELECT * FROM ou WHERE id=".$rou);
 	    if (!empty($ou_info)) {
 		if (empty($ou_info['enabled'])) { $ou_info['enabled'] = 0; }
 		if (empty($ou_info['queue_id'])) { $ou_info['queue_id'] = 0; }
@@ -103,9 +103,9 @@ if ($msg_error) {
 $sort_table = 'U';
 $sort_url = "<a href=/admin/users/index.php?";
 
-if ($rou == 0) { $filter = "U.ou_id=O.id and U.deleted=0"; } else { $filter = "U.OU_id=O.id and U.deleted=0 and U.ou_id=$rou"; }
+if ($rou == 0) { $filter = "U.ou_id=O.id and U.deleted=0"; } else { $filter = "U.ou_id=O.id and U.deleted=0 and U.ou_id=$rou"; }
 
-$countSQL = "SELECT Count(*) FROM user_list U, OU O WHERE $filter";
+$countSQL = "SELECT Count(*) FROM user_list U, ou O WHERE $filter";
 $count_records = get_single_field($db_link,$countSQL);
 $total=ceil($count_records/$displayed);
 if ($page>$total) { $page=$total; }
@@ -113,7 +113,7 @@ if ($page<1) { $page=1; }
 $start = ($page * $displayed) - $displayed;
 print_navigation($page_url,$page,$displayed,$count_records,$total);
 
-$sSQL = "SELECT U.id, U.login, U.fio, O.ou_name, U.enabled, U.day_quota, U.month_quota, U.blocked, U.permanent FROM user_list U, OU O WHERE $filter ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
+$sSQL = "SELECT U.id, U.login, U.fio, O.ou_name, U.enabled, U.day_quota, U.month_quota, U.blocked, U.permanent FROM user_list U, ou O WHERE $filter ORDER BY $sort_table.$sort_field $order LIMIT $start,$displayed";
 
 ?>
 

html/inc/common.php

@@ -787,7 +787,7 @@ function print_ou_select_recursive($db, $ou_name, $ou_value, $parent_id = null,
     
     $where = implode(" AND ", $conditions);
     
-    $sql = "SELECT id, parent_id, ou_name FROM OU 
+    $sql = "SELECT id, parent_id, ou_name FROM ou 
             WHERE $where 
             ORDER BY ou_name";
     
@@ -1104,7 +1104,7 @@ function get_ou($db, $ou_value)
     if (!isset($ou_value)) {
         return;
     }
-    $ou_name = get_record_sql($db, "SELECT ou_name FROM OU WHERE id=$ou_value");
+    $ou_name = get_record_sql($db, "SELECT ou_name FROM ou WHERE id=$ou_value");
     if (empty($ou_name)) {
         return;
     }
@@ -2296,7 +2296,7 @@ function apply_auth_rule($db, $auth_record, $user_id)
 function fix_auth_rules($db)
 {
     //cleanup hotspot subnet rules
-    $t_hotspot = get_records_sql($db, "SELECT * FROM OU WHERE default_users=1 or default_hotspot=1");
+    $t_hotspot = get_records_sql($db, "SELECT * FROM ou WHERE default_users=1 or default_hotspot=1");
     if (!empty($t_hotspot)) {
         foreach ($t_hotspot as $row) {
             delete_record($db, "auth_rules", "ou_id='" . $row['id'] . "'");
@@ -2332,7 +2332,7 @@ function new_user($db, $user_info)
     }
 
     $user['ou_id'] = $user_info['ou_id'];
-    $ou_info = get_record_sql($db, "SELECT * FROM OU WHERE id=" . $user_info['ou_id']);
+    $ou_info = get_record_sql($db, "SELECT * FROM ou WHERE id=" . $user_info['ou_id']);
     if (!empty($ou_info)) {
         $user['enabled'] = $ou_info['enabled'];
         if (empty($user['enabled'])) {
@@ -3773,14 +3773,14 @@ if (preg_match('/127.0.0.1/', $config["torrus_url"])) {
 $config["dns_server"] = get_option($db_link, 3);
 $config["dns_server_type"] = get_option($db_link, 70);
 
-$ou = get_record_sql($db_link, "SELECT id FROM OU WHERE default_users = 1");
+$ou = get_record_sql($db_link, "SELECT id FROM ou WHERE default_users = 1");
 if (empty($ou)) {
     $config["default_user_ou_id"] = 0;
 } else {
     $config["default_user_ou_id"] = $ou['id'];
 }
 
-$ou = get_record_sql($db_link, "SELECT id FROM OU WHERE default_hotspot=1");
+$ou = get_record_sql($db_link, "SELECT id FROM ou WHERE default_hotspot=1");
 if (empty($ou)) {
     $config["default_hotspot_ou_id"] = $config["default_user_ou_id"];
 } else {

scripts/eyelib/common.pm

@@ -1024,7 +1024,7 @@ my $login_count = get_count_records($db,"user_list","(login LIKE '".$user->{logi
 if ($login_count) { $login_count++; $user->{login} .="(".$login_count.")"; }
 
 $user->{ou_id} = $user_info->{ou_id};
-my $ou_info = get_record_sql($db,"SELECT * FROM OU WHERE id=".$user_info->{'ou_id'});
+my $ou_info = get_record_sql($db,"SELECT * FROM ou WHERE id=".$user_info->{'ou_id'});
 if ($ou_info) {
     $user->{'enabled'} = $ou_info->{'enabled'};
     $user->{'queue_id'} = $ou_info->{'queue_id'};
@@ -1225,7 +1225,7 @@ $cur_auth_id=get_id_record($db,'user_auth',"ip='$ip' and mac='$mac' and deleted=
 if ($cur_auth_id) {
     my $user_record=get_record_sql($db,"SELECT * FROM user_list WHERE id=".$new_user_id);
     if ($user_record) {
-	    my $ou_info = get_record_sql($db,'SELECT * FROM OU WHERE id='.$user_record->{ou_id});
+	    my $ou_info = get_record_sql($db,'SELECT * FROM ou WHERE id='.$user_record->{ou_id});
 	    if ($ou_info and $ou_info->{'dynamic'}) {
                     # Устанавливаем значение по умолчанию, если не задано
                     if (!$ou_info->{'life_duration'}) { 
@@ -1303,7 +1303,7 @@ return $cur_auth_id;
 sub get_dynamic_ou {
 my $db = shift;
 my @dynamic=();
-my @ou_list = get_records_sql($db,"SELECT id FROM OU WHERE dynamic = 1");
+my @ou_list = get_records_sql($db,"SELECT id FROM ou WHERE dynamic = 1");
 foreach my $group (@ou_list) {
     next if (!$group);
     push(@dynamic,$group->{id});
@@ -1316,9 +1316,9 @@ return wantarray ? @dynamic : \@dynamic;
 sub get_default_ou {
 my $db = shift;
 my @dynamic=();
-my $ou = get_record_sql($db,"SELECT id FROM OU WHERE default_users = 1");
+my $ou = get_record_sql($db,"SELECT id FROM ou WHERE default_users = 1");
 if (!$ou) { push(@dynamic,0); } else { push(@dynamic,$ou->{'id'}); }
-$ou = get_record_sql($db,"SELECT id FROM OU WHERE default_hotspot = 1");
+$ou = get_record_sql($db,"SELECT id FROM ou WHERE default_hotspot = 1");
 if ($ou) { push(@dynamic,$ou->{id}); }
 return wantarray ? @dynamic : \@dynamic;
 }

scripts/eyelib/database.pm

@@ -1136,10 +1136,10 @@ $history_syslog_day = get_option($db,48);
 
 $history_trafstat_day = get_option($db,49);
 
-my $ou = get_record_sql($db,"SELECT id FROM OU WHERE default_users = 1");
+my $ou = get_record_sql($db,"SELECT id FROM ou WHERE default_users = 1");
 if (!$ou) { $default_user_ou_id = 0; } else { $default_user_ou_id = $ou->{'id'}; }
 
-$ou = get_record_sql($db,"SELECT id FROM OU WHERE default_hotspot = 1 ");
+$ou = get_record_sql($db,"SELECT id FROM ou WHERE default_hotspot = 1 ");
 if (!$ou) { $default_hotspot_ou_id = $default_user_ou_id; } else { $default_hotspot_ou_id = $ou->{'id'}; }
 
 @subnets=get_records_sql($db,'SELECT * FROM subnets ORDER BY ip_int_start');

scripts/gen_nagios_config.pl

@@ -37,7 +37,7 @@ my %dependency;
 
 my $nagios_devices = "/etc/snmp/devices.cfg";
 
-my @OU_list = get_records_sql($dbh,"SELECT * FROM OU");
+my @OU_list = get_records_sql($dbh,"SELECT * FROM ou");
 my %ou;
 my @cfg_dirs = ();
 foreach my $row (@OU_list) {

scripts/utils/reaply_rules.pl

@@ -32,7 +32,7 @@ my $group_id = $ARGV[0];
 
 exit if (!$group_id);
 
-my $group = get_record_sql($dbh,"SELECT * FROM OU WHERE id=$group_id");
+my $group = get_record_sql($dbh,"SELECT * FROM ou WHERE id=$group_id");
 
 print "Analyzed rules for group id: $group_id name: $group->{ou_name}\n";
 

scripts/utils/set_port_descr.pl

@@ -94,7 +94,7 @@ if ($conn->{auth_id}) {
 foreach my $conn_id (keys %conn_info) {
 if (exists $port_info{$conn_info{$conn_id}{port_id}}{count}) {
     $port_info{$conn_info{$conn_id}{port_id}}{count}++;
-    #OU: Switches, Routers, WiFi AP
+    #ou: Switches, Routers, WiFi AP
     if ($conn_info{$conn_id}{device} and $conn_info{$conn_id}{description}) {
         if ($conn_info{$conn_id}{device}{device_name}) {
             $port_info{$conn_info{$conn_id}{port_id}}{description} = $conn_info{$conn_id}{device}{device_name};