From 526a0cdb6845ddbce147c69c3e0c300316749023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 25 Feb 2010 08:14:00 +0000 Subject: [PATCH] =?UTF-8?q?Rechte=20Problem=20im=20Filesystem=20behoben.?= =?UTF-8?q?=20Sudo=20chown=20muss=20jetzt=20aktiviert=20sein=20f=C3=BCr=20?= =?UTF-8?q?www-data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/lehre/menu.php | 17 +----- cis/private/lehre/pinboard.php | 16 ++--- cis/private/lehre/semupload.php | 5 +- cis/private/lehre/upload.php | 28 ++++----- include/tw/cis_menu_lv.inc.php | 100 ++++++++++++++++---------------- 5 files changed, 78 insertions(+), 88 deletions(-) diff --git a/cis/private/lehre/menu.php b/cis/private/lehre/menu.php index 7ffa7feaa..285780de1 100644 --- a/cis/private/lehre/menu.php +++ b/cis/private/lehre/menu.php @@ -400,22 +400,7 @@ function js_toggle_container(conid) path.'/" class="MenuItem" target="_blank"> Allgemeiner Download'; - } + echo ' Allgemeiner Download'; ?> diff --git a/cis/private/lehre/pinboard.php b/cis/private/lehre/pinboard.php index b20d6bde2..adffb2353 100644 --- a/cis/private/lehre/pinboard.php +++ b/cis/private/lehre/pinboard.php @@ -673,10 +673,10 @@ function show(id) { if(!is_dir($path)) { - if(!is_dir('../../../documents/'.strtolower($short))) - exec('mkdir -m 755 "../../../documents/'.strtolower($short).'"'); - exec('mkdir -m 775 "../../../documents/'.strtolower($short).'/lehrziele"'); - exec('chgrp teacher ../../../documents/'.strtolower($short).'/lehrziele'); + if(!is_dir(DOC_ROOT.'/documents/'.strtolower($short))) + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.strtolower($short).'"'); + exec('mkdir -m 775 "'.DOC_ROOT.'/documents/'.strtolower($short).'/lehrziele"'); + exec('sudo chown :teacher "'.DOC_ROOT.'/documents/'.strtolower($short).'/lehrziele"'); } } @@ -712,10 +712,10 @@ function show(id) { if(!is_dir($path)) { - if(!is_dir('../../../documents/'.strtolower($short))) - exec('mkdir -m 775 "../../../documents/'.strtolower($short).'"'); - exec('mkdir -m 775 "../../../documents/'.strtolower($short).'/download"'); - exec('sudo chgrp teacher ../../../documents/'.strtolower($short).'/download'); + if(!is_dir(DOC_ROOT.'/documents/'.strtolower($short))) + exec('mkdir -m 775 "'.DOC_ROOT.'/documents/'.strtolower($short).'"'); + exec('mkdir -m 775 "'.DOC_ROOT.'/documents/'.strtolower($short).'/download"'); + exec('sudo chown :teacher "'.DOC_ROOT.'/documents/'.strtolower($short).'/download"'); } } diff --git a/cis/private/lehre/semupload.php b/cis/private/lehre/semupload.php index 4f978a109..1a24fd85b 100644 --- a/cis/private/lehre/semupload.php +++ b/cis/private/lehre/semupload.php @@ -31,7 +31,7 @@ if(!$stg_obj->load($lv_obj->studiengang_kz)) die('Fehler beim Laden des Studienganges'); - $openpath = '../../../documents/'.strtolower($stg_obj->kuerzel).'/'.$lv_obj->semester.'/'.strtolower($lv_obj->lehreverzeichnis).'/semesterplan/'; + $openpath = DOC_ROOT.'/documents/'.strtolower($stg_obj->kuerzel).'/'.$lv_obj->semester.'/'.strtolower($lv_obj->lehreverzeichnis).'/semesterplan/'; ?> @@ -113,7 +113,10 @@ function ConfirmFile(handle) !stristr($fn, '.cgi') && !stristr($fn, '.pl')) { if(move_uploaded_file($_FILES['userfile']['tmp_name'],$openpath . $fn)) + { + exec('sudo chown www-data:teacher "'.$openpath.$fn.'"'); echo "
Das File wurde erfolgreich hochgeladen
"; + } else echo "
Fehler beim Upload! Bitte Versuchen Sie es erneut
"; } diff --git a/cis/private/lehre/upload.php b/cis/private/lehre/upload.php index fcee044b4..972751735 100644 --- a/cis/private/lehre/upload.php +++ b/cis/private/lehre/upload.php @@ -77,8 +77,9 @@ else $is_lector=false; - $upload_root = "../../../documents"; - + $upload_root = DOC_ROOT.'/documents';//"../../../documents"; + $link_cut = DOC_ROOT.'/documents'; + if(isset($subdir)) { if(substr_count($subdir, '..') > 0 || substr_count($subdir, '.') > 0) @@ -636,11 +637,11 @@ A:hover { exec('chmod 664 "'.$uploadfile.'"'); if($islector) { - exec('chgrp teacher "'.$uploadfile.'"'); + exec('sudo chown :teacher "'.$uploadfile.'"'); } else { - exec('chgrp student "'.$uploadfile.'"'); + exec('sudo chown :student "'.$uploadfile.'"'); } } } @@ -659,11 +660,11 @@ A:hover { exec('chmod 664 "'.$uploadfile.'"'); if($islector) { - exec('chgrp teacher "'.$uploadfile.'"'); + exec('sudo chown :teacher "'.$uploadfile.'"'); } else { - exec('chgrp student "'.$uploadfile.'"'); + exec('sudo chown :student "'.$uploadfile.'"'); } } } @@ -692,11 +693,11 @@ A:hover { exec('chmod 664 "'.$uploadfile.'"'); if($islector) { - exec('chgrp teacher "'.$uploadfile.'"'); + exec('sudo chown :teacher "'.$uploadfile.'"'); } else { - exec('chgrp student "'.$uploadfile.'"'); + exec('sudo chown :student "'.$uploadfile.'"'); } } } @@ -715,11 +716,11 @@ A:hover { exec('chmod 664 "'.$uploadfile.'"'); if($islector) { - exec('chgrp teacher "'.$uploadfile.'"'); + exec('sudo chown :teacher "'.$uploadfile.'"'); } else { - exec('chgrp student "'.$uploadfile.'"'); + exec('sudo chown :student "'.$uploadfile.'"'); } } } @@ -848,11 +849,11 @@ A:hover { if($islector) { - exec('chgrp teacher "'.$dest_create_dir->path.'/'.$new_dir_name_text.'"'); + exec('sudo chown :teacher "'.$dest_create_dir->path.'/'.$new_dir_name_text.'"'); } else { - exec('chgrp student "'.$dest_create_dir->path.'/'.$new_dir_name_text.'"'); + exec('sudo chown :student "'.$dest_create_dir->path.'/'.$new_dir_name_text.'"'); } } } @@ -1293,6 +1294,7 @@ A:hover { { if(!@is_dir($dest_dir->path.'/'.$entry) && substr($entry,0,1)!=".") { + unset($check_state); $null_file = false; if(isset($_POST['_check_state_'.$file_count])) $check_state = $_POST['_check_state_'.$file_count]; @@ -1307,7 +1309,7 @@ A:hover { } if(!isset($link_cut)) $link_cut=''; - $link_path = mb_substr($dest_dir->path, mb_strlen($link_cut)).'/'.urlencode($entry); + $link_path = '../../../documents'.mb_substr($dest_dir->path, mb_strlen($link_cut)).'/'.urlencode($entry); //+ durch %20 ersetzten damit Files mit leerzeichen geoeffnet werden koennen $link_path = str_replace("+","%20",$link_path); echo "  $entry "; diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php index 599aeba3b..b6f4692d8 100644 --- a/include/tw/cis_menu_lv.inc.php +++ b/include/tw/cis_menu_lv.inc.php @@ -84,7 +84,7 @@ if(!is_dir($dir_name)) { exec('mkdir -m 755 "'.$dir_name.'"'); - exec('chown www-data:teacher "'.$dir_name.'"'); + exec('sudo chown www-data:teacher "'.$dir_name.'"'); } /* @@ -105,25 +105,25 @@ $dest_dir = @dir($dir_name); if(!@is_dir($dest_dir->path)) { - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/semesterplan')) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/semesterplan')) { - exec('mkdir -m 775 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/semesterplan"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/semesterplan"'); + exec('mkdir -m 775 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/semesterplan"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/semesterplan"'); } } @@ -185,25 +185,25 @@ $dest_dir = @dir($dir_name); if(!@is_dir($dest_dir->path)) { - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/download')) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/download')) { - exec('mkdir -m 775 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/download"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/download"'); + exec('mkdir -m 775 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/download"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/download"'); } } @@ -278,25 +278,25 @@ $dest_dir = @dir($dir_name); if(!@is_dir($dest_dir->path)) { - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/leistung')) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/leistung')) { - exec('mkdir -m 775 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/leistung"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/leistung"'); + exec('mkdir -m 775 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/leistung"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/leistung"'); } } @@ -534,30 +534,30 @@ /*if(!@is_dir($dir_name)) { exec('mkdir -m 775 "'.$dir_name.'"'); - exec('chown www-data:student "'.$dir_name.'"'); + exec('sudo chown www-data:student "'.$dir_name.'"'); }*/ $dest_dir = @dir($dir_name); if(!@is_dir($dest_dir->path)) { - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester)) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name))) { - exec('mkdir -m 755 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); - exec('chown www-data:teacher "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('mkdir -m 755 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); + exec('sudo chown www-data:teacher "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'"'); } - if(!@is_dir($DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/upload')) + if(!@is_dir(DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/upload')) { - exec('mkdir -m 775 "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/upload"'); - exec('chown www-data:student "'.$DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/upload"'); + exec('mkdir -m 775 "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/upload"'); + exec('sudo chown www-data:student "'.DOC_ROOT.'/documents/'.mb_strtolower($kurzbz).'/'.$semester.'/'.mb_strtolower($short_short_name).'/upload"'); } }