Rev 443 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 443 | Rev 496 | ||
---|---|---|---|
Line 149... | Line 149... | ||
149 | OIDplus::logger()->log("[INFO]RA($new_ra)!", "Gained ownership of object '$id' due to RA transfer of superior RA / admin."); |
149 | OIDplus::logger()->log("[INFO]RA($new_ra)!", "Gained ownership of object '$id' due to RA transfer of superior RA / admin."); |
150 | if ($parentObj = $obj->getParent()) { |
150 | if ($parentObj = $obj->getParent()) { |
151 | $parent_oid = $parentObj->nodeId(); |
151 | $parent_oid = $parentObj->nodeId(); |
152 | OIDplus::logger()->log("[INFO]OID($parent_oid)", "RA of object '$id' changed from '$current_ra' to '$new_ra'"); |
152 | OIDplus::logger()->log("[INFO]OID($parent_oid)", "RA of object '$id' changed from '$current_ra' to '$new_ra'"); |
153 | } |
153 | } |
154 | $this->ra_change_rec($id, $current_ra, $new_ra); // Inherited RAs rekursiv mitändern |
154 | $this->ra_change_rec($id, $current_ra, $new_ra); // Inherited RAs rekursiv mit�ndern |
155 | } |
155 | } |
156 | } |
156 | } |
157 | 157 | ||
158 | // Log if confidentially flag was changed |
158 | // Log if confidentially flag was changed |
159 | OIDplus::logger()->log("[INFO]OID($id)+[?INFO/!OK]SUPOIDRA($id)?/[?INFO/!OK]A?", "Identifiers/Confidential flag of object '$id' updated"); // TODO: Check if they were ACTUALLY updated! |
159 | OIDplus::logger()->log("[INFO]OID($id)+[?INFO/!OK]SUPOIDRA($id)?/[?INFO/!OK]A?", "Identifiers/Confidential flag of object '$id' updated"); // TODO: Check if they were ACTUALLY updated! |
Line 371... | Line 371... | ||
371 | $handled = true; |
371 | $handled = true; |
372 | 372 | ||
373 | $out['title'] = OIDplus::config()->getValue('system_title'); |
373 | $out['title'] = OIDplus::config()->getValue('system_title'); |
374 | $out['icon'] = OIDplus::webpath(__DIR__).'system_big.png'; |
374 | $out['icon'] = OIDplus::webpath(__DIR__).'system_big.png'; |
375 | 375 | ||
376 | if (file_exists(OIDplus::basePath() . '/userdata/welcome/welcome$'.OIDplus::getCurrentLang().'.html')) { |
376 | if (file_exists(OIDplus::localpath() . 'userdata/welcome/welcome$'.OIDplus::getCurrentLang().'.html')) { |
377 | $cont = file_get_contents(OIDplus::basePath() . '/userdata/welcome/welcome$'.OIDplus::getCurrentLang().'.html'); |
377 | $cont = file_get_contents(OIDplus::localpath() . 'userdata/welcome/welcome$'.OIDplus::getCurrentLang().'.html'); |
378 | } else if (file_exists(OIDplus::basePath() . '/userdata/welcome/welcome.html')) { |
378 | } else if (file_exists(OIDplus::localpath() . 'userdata/welcome/welcome.html')) { |
379 | $cont = file_get_contents(OIDplus::basePath() . '/userdata/welcome/welcome.html'); |
379 | $cont = file_get_contents(OIDplus::localpath() . 'userdata/welcome/welcome.html'); |
380 | } else if (file_exists(__DIR__ . '/welcome$'.OIDplus::getCurrentLang().'.html')) { |
380 | } else if (file_exists(__DIR__ . '/welcome$'.OIDplus::getCurrentLang().'.html')) { |
381 | $cont = file_get_contents(__DIR__ . '/welcome$'.OIDplus::getCurrentLang().'.html'); |
381 | $cont = file_get_contents(__DIR__ . '/welcome$'.OIDplus::getCurrentLang().'.html'); |
382 | } else if (file_exists(__DIR__ . '/welcome.html')) { |
382 | } else if (file_exists(__DIR__ . '/welcome.html')) { |
383 | $cont = file_get_contents(__DIR__ . '/welcome.html'); |
383 | $cont = file_get_contents(__DIR__ . '/welcome.html'); |
384 | } else { |
384 | } else { |
Line 664... | Line 664... | ||
664 | $json[] = array( |
664 | $json[] = array( |
665 | 'id' => "oidplus:system", |
665 | 'id' => "oidplus:system", |
666 | 'text' => _L('Objects'), |
666 | 'text' => _L('Objects'), |
667 | 'state' => array( |
667 | 'state' => array( |
668 | "opened" => true, |
668 | "opened" => true, |
669 | // "selected" => true) // "selected" ist buggy: 1) Das select-Event wird beim Laden nicht gefeuert 2) Die direkt untergeordneten Knoten lassen sich nicht öffnen (laden für ewig) |
669 | // "selected" => true) // "selected" ist buggy: 1) Das select-Event wird beim Laden nicht gefeuert 2) Die direkt untergeordneten Knoten lassen sich nicht �ffnen (laden f�r ewig) |
670 | ), |
670 | ), |
671 | 'icon' => OIDplus::webpath(__DIR__).'system.png', |
671 | 'icon' => OIDplus::webpath(__DIR__).'system.png', |
672 | 'children' => $objTypesChildren |
672 | 'children' => $objTypesChildren |
673 | ); |
673 | ); |
674 | 674 | ||
Line 819... | Line 819... | ||
819 | if ($objParent->userHasWriteRights()) { |
819 | if ($objParent->userHasWriteRights()) { |
820 | $output .= '<tr>'; |
820 | $output .= '<tr>'; |
821 | $prefix = is_null($objParent) ? '' : $objParent->crudInsertPrefix(); |
821 | $prefix = is_null($objParent) ? '' : $objParent->crudInsertPrefix(); |
822 | if ($parentNS == 'oid') { |
822 | if ($parentNS == 'oid') { |
823 | if ($objParent->isWeid(true)) { |
823 | if ($objParent->isWeid(true)) { |
824 | $output .= ' <td>'.$prefix.' <input oninput="frdl_oidid_change()" type="text" id="id" value="" style="width:100%;min-width:100px"></td>'; // TODO: idee classname vergeben, z.B. "OID" und dann mit einem oid-spezifischen css die breite einstellbar machen, somit hat das plugin mehr kontrolle über das aussehen und die mindestbreiten |
824 | $output .= ' <td>'.$prefix.' <input oninput="frdl_oidid_change()" type="text" id="id" value="" style="width:100%;min-width:100px"></td>'; // TODO: idee classname vergeben, z.B. "OID" und dann mit einem oid-spezifischen css die breite einstellbar machen, somit hat das plugin mehr kontrolle �ber das aussehen und die mindestbreiten |
825 | $output .= ' <td><input type="text" name="weid" id="weid" value="" oninput="frdl_weid_change()"></td>'; |
825 | $output .= ' <td><input type="text" name="weid" id="weid" value="" oninput="frdl_weid_change()"></td>'; |
826 | } else { |
826 | } else { |
827 | $output .= ' <td>'.$prefix.' <input type="text" id="id" value="" style="width:100%;min-width:50px"></td>'; // TODO: idee classname vergeben, z.B. "OID" und dann mit einem oid-spezifischen css die breite einstellbar machen, somit hat das plugin mehr kontrolle über das aussehen und die mindestbreiten |
827 | $output .= ' <td>'.$prefix.' <input type="text" id="id" value="" style="width:100%;min-width:50px"></td>'; // TODO: idee classname vergeben, z.B. "OID" und dann mit einem oid-spezifischen css die breite einstellbar machen, somit hat das plugin mehr kontrolle �ber das aussehen und die mindestbreiten |
828 | if ($one_weid_available) $output .= ' <td></td>'; // WEID-editor not available for root nodes. Do it manually, please |
828 | if ($one_weid_available) $output .= ' <td></td>'; // WEID-editor not available for root nodes. Do it manually, please |
829 | } |
829 | } |
830 | } else { |
830 | } else { |
831 | $output .= ' <td>'.$prefix.' <input type="text" id="id" value=""></td>'; |
831 | $output .= ' <td>'.$prefix.' <input type="text" id="id" value=""></td>'; |
832 | } |
832 | } |
Line 874... | Line 874... | ||
874 | // 'importcss' added 17 September 2020, because it breaks the "Format/Style" dropdown box ("styleselect" toolbar) |
874 | // 'importcss' added 17 September 2020, because it breaks the "Format/Style" dropdown box ("styleselect" toolbar) |
875 | public static $exclude_tinymce_plugins = array('fullpage', 'bbcode', 'quickbars', 'colorpicker', 'textcolor', 'contextmenu', 'importcss'); |
875 | public static $exclude_tinymce_plugins = array('fullpage', 'bbcode', 'quickbars', 'colorpicker', 'textcolor', 'contextmenu', 'importcss'); |
876 | 876 | ||
877 | protected static function showMCE($name, $content) { |
877 | protected static function showMCE($name, $content) { |
878 | $mce_plugins = array(); |
878 | $mce_plugins = array(); |
879 | foreach (glob(OIDplus::basePath().'/3p/tinymce/plugins/*') as $m) { // */ |
879 | foreach (glob(OIDplus::localpath().'3p/tinymce/plugins/*') as $m) { // */ |
880 | $mce_plugins[] = basename($m); |
880 | $mce_plugins[] = basename($m); |
881 | } |
881 | } |
882 | 882 | ||
883 | foreach (self::$exclude_tinymce_plugins as $exclude) { |
883 | foreach (self::$exclude_tinymce_plugins as $exclude) { |
884 | $index = array_search($exclude, $mce_plugins); |
884 | $index = array_search($exclude, $mce_plugins); |
Line 891... | Line 891... | ||
891 | strtolower(substr($oidplusLang,0,2)).'_'.strtoupper(substr($oidplusLang,2,2)), // de_DE |
891 | strtolower(substr($oidplusLang,0,2)).'_'.strtoupper(substr($oidplusLang,2,2)), // de_DE |
892 | strtolower(substr($oidplusLang,0,2)) // de |
892 | strtolower(substr($oidplusLang,0,2)) // de |
893 | ); |
893 | ); |
894 | $tinyMCELang = ''; |
894 | $tinyMCELang = ''; |
895 | foreach ($langCandidates as $candidate) { |
895 | foreach ($langCandidates as $candidate) { |
896 | if (file_exists(OIDplus::basePath().'/3p/tinymce/langs/'.$candidate.'.js')) { |
896 | if (file_exists(OIDplus::localpath().'3p/tinymce/langs/'.$candidate.'.js')) { |
897 | $tinyMCELang = $candidate; |
897 | $tinyMCELang = $candidate; |
898 | break; |
898 | break; |
899 | } |
899 | } |
900 | } |
900 | } |
901 | 901 | ||
902 | $out = '<script> |
902 | $out = '<script> |
903 | tinymce.EditorManager.baseURL = "3p/tinymce"; |
903 | tinymce.EditorManager.baseURL = "3p/tinymce"; |
904 | tinymce.init({ |
904 | tinymce.init({ |
905 | document_base_url: "'.OIDplus::getSystemUrl().'", |
905 | document_base_url: "'.OIDplus::webpath().'", |
906 | selector: "#'.$name.'", |
906 | selector: "#'.$name.'", |
907 | height: 200, |
907 | height: 200, |
908 | statusbar: false, |
908 | statusbar: false, |
909 | // menubar:false, |
909 | // menubar:false, |
910 | // toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | fontsizeselect", |
910 | // toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | fontsizeselect", |