diff options
Diffstat (limited to 'mayor-orig/mayor-base')
10 files changed, 20 insertions, 18 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index d197bb6d..7e1fd933 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4675 +4716 diff --git a/mayor-orig/mayor-base/www/include/backend/ads/session/base.php b/mayor-orig/mayor-base/www/include/backend/ads/session/base.php index 3a727c3b..edb47858 100644 --- a/mayor-orig/mayor-base/www/include/backend/ads/session/base.php +++ b/mayor-orig/mayor-base/www/include/backend/ads/session/base.php @@ -138,7 +138,7 @@ $userDn = ADSuserAccountToDn($userAccount, $toPolicy); if (in_array($group, $AUTH[$toPolicy]['categories'])) { - if (strpos($userDn, ',ou='.ekezettelen($group).',') !== false) return true; + if (strpos(kisbetus($userDn), ',ou='.ekezettelen($group).',') !== false) return true; # Ha nincs megfelelő ou-ban, akkor nézzük a csoport tagságot - így berakható időszakosan akárki pl a titkárság kategóriába... # else return false; } diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php index 113e380b..5643f0af 100644 --- a/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php +++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php @@ -140,7 +140,7 @@ $_THESE = '*'; $v = array(); } - $q = "SELECT $_THESE FROM groups WHERE groupCn='%s' AND policy='%s'"; + $q = "SELECT $_THESE FROM `groups` WHERE groupCn='%s' AND policy='%s'"; array_push($v, $groupCn, $toPolicy); $A = db_query($q, array('fv' => 'mysqlGetGroupInfo', 'modul' => $modul, 'result' => 'record', 'values' => $v), $lr); @@ -185,7 +185,7 @@ $lr = db_connect($modul, array('fv' => 'mysqlChangeGroupInfo')); if (!$lr) return false; - $q = "SELECT gid FROM groups WHERE groupCn='%s' AND policy='%s'"; + $q = "SELECT gid FROM `groups` WHERE groupCn='%s' AND policy='%s'"; $v = array($groupCn, $toPolicy); $gid = db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); if ($gid === false) { db_close($lr); return false; } @@ -241,7 +241,7 @@ $v = array($attr); } } - $q = "UPDATE groups SET $W WHERE groupCn='%s' AND policy='%s'"; + $q = "UPDATE `groups` SET $W WHERE groupCn='%s' AND policy='%s'"; array_push($v, $groupCn, $toPolicy); db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'values' => $v), $lr); } diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php index 35272ff8..2964957b 100644 --- a/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php +++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php @@ -32,7 +32,7 @@ } // Az gid lekérdezése - $q = "SELECT gid FROM groups WHERE groupCn = '%s' AND policy = '%s'"; + $q = "SELECT gid FROM `groups` WHERE groupCn = '%s' AND policy = '%s'"; $v = array($groupCn, $toPolicy); $gid = db_query($q, array('fv' => 'mysqlMemberOf', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); if ($gid === false) { diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php index 25ff9132..4f34aea6 100644 --- a/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php +++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php @@ -79,7 +79,7 @@ $category = $SET['groups'][$i]; $groupCn = kisbetus(ekezettelen($category)); if ($category == '') continue; - $q = "SELECT gid FROM groups WHERE groupCn='%s'"; + $q = "SELECT gid FROM `groups` WHERE groupCn='%s'"; $gid = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'result' => 'value', 'values' => array($groupCn)), $lr); if ($gid === false || is_null($gid)) { // --FIXME -- ez jó így BENCE radyx if ($SET['createGroup']) { diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php index d1bc4f7b..495af44d 100644 --- a/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php +++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php @@ -16,14 +16,14 @@ if (!$lr) return false; // cn ütközés ellenőrzése - $q = "SELECT COUNT(*) FROM groups WHERE policy='%s' AND groupCn='%s'"; + $q = "SELECT COUNT(*) FROM `groups` WHERE policy='%s' AND groupCn='%s'"; $v = array($toPolicy, $groupCn); $num = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); if ($num === false) { db_close($lr); return false; } if ($num > 0) { $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; db_close($lr); return false; } // csoport felvétel - $q = "INSERT INTO groups (groupCn, groupDesc, policy) VALUES ('%s', '%s','%s')"; + $q = "INSERT INTO `groups` (groupCn, groupDesc, policy) VALUES ('%s', '%s','%s')"; $v = array($groupCn, $groupDesc, $toPolicy); $gid = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'insert', 'values' => $v), $lr); if ($gid === false) { db_close($lr); return false; } diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php index fa4584b0..ef249342 100644 --- a/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php +++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php @@ -64,7 +64,7 @@ if (!$lr) return false; // Keresés if ($attr == 'member') { - $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members + $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM `groups` LEFT JOIN members ON members.gid=groups.gid LEFT JOIN accounts USING (uid) WHERE gid IN @@ -72,7 +72,7 @@ AND groups.policy='%s'"; $v = array_merge($searchAttrs, array($pattern, $toPolicy, $toPolicy)); } else { - $q = "SELECT DISTINCT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members + $q = "SELECT DISTINCT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM `groups` LEFT JOIN members ON members.gid=groups.gid LEFT JOIN accounts USING (uid) WHERE `%s` LIKE '%%%s%%' AND groups.policy='%s'"; @@ -122,7 +122,7 @@ $homeDirectory = $ret['homeDirectory']; // de nem használjuk semmire... // A user csoport törlése - $q = "DELETE FROM groups WHERE gid=%u"; + $q = "DELETE FROM `groups` WHERE gid=%u"; $v = array($ret['uid']); $r = db_query($q, array('fv' => 'mysqlDeleteAccount', 'modul' => $modul, 'values' => $v), $lr); if (!$r) { db_close($lr); return false; } @@ -155,7 +155,7 @@ } // csoport törlése - $q = "DELETE FROM groups WHERE policy='%s' AND groupCn='%s'"; + $q = "DELETE FROM `groups` WHERE policy='%s' AND groupCn='%s'"; $v = array($toPolicy, $groupCn); $r = db_query($q, array('fv' => 'mysqlDeleteGroup', 'modul' => "$toPolicy auth", 'values' => $v)); diff --git a/mayor-orig/mayor-base/www/include/base/mysql.php b/mayor-orig/mayor-base/www/include/base/mysql.php index 819fdcd0..e4322dc8 100644 --- a/mayor-orig/mayor-base/www/include/base/mysql.php +++ b/mayor-orig/mayor-base/www/include/base/mysql.php @@ -91,11 +91,11 @@ mysqli_set_charset($lr, "utf8"); mysqli_query($lr, "SET NAMES utf8"); mysqli_query($lr, "SET collation_connection='utf8_hungarian_ci'"); - mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))"); + mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''),'NO_ZERO_DATE',''))"); } else { mysql_query("SET NAMES utf8", $lr); mysql_query("SET collation_connection='utf8_hungarian_ci'", $lr); - mysql_query("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))", $lr); + mysql_query("SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''),'NO_ZERO_DATE',''))", $lr); } } else { $_SESSION['alert'][] = "message:sql_select_db_failure:db_connect/${SET['fv']}:$modul:".$MYSQL_DATA[$modul]['db']; diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css index 54b53fb8..4ee80f46 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css +++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css @@ -102,7 +102,8 @@ padding-left: 140px; } - #nav li { position: relative; } + #nav li { position: relative; } + #nav li:first { white-space: nowrap; } #nav > li { float: left; z-index: 20; text-align: center; padding: 0; /* background-color: #3fa79c; */ background-color: #3496B9; diff --git a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml index 19dfa38e..78a5dea8 100644 --- a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml +++ b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml @@ -137,7 +137,8 @@ function includeJS($page,$sub,$f,$skin) { echo '<script language="JavaScript" type="text/javascript" charset="utf-8" src="'.$_f.'?ver='._MAYORREV.'"></script>'."\n"; } } - if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') { +/* + if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') { // disabled // Koschtit Image Gallery if ($page == 'portal') { //require_once('skin/classic/share/javascript/koschtit/ki_include.php'); @@ -147,7 +148,7 @@ function includeJS($page,$sub,$f,$skin) { <script src="skin/classic/share/javascript/tiny_mce/tiny_mce.js" type="text/javascript"></script> <script src="skin/classic/module-portal/javascript/hirek/egyhir.php?lang='.$lang.'" type="text/javascript"></script>'; } - +*/ // if (file_exists(($_f="skin/$skin/base/javascript/jstorage.min.js")) ) { // echo '<script language="JavaScript" type="text/javascript" charset="utf-8" src="'.$_f.'?ver='._MAYORREV.'"></script>'."\n"; // } |