diff --git a/phpwf/plugins/class.yui.php b/phpwf/plugins/class.yui.php
index a29787e1..c9ffc95d 100644
--- a/phpwf/plugins/class.yui.php
+++ b/phpwf/plugins/class.yui.php
@@ -8780,6 +8780,42 @@ a.land as land, p.abkuerzung as projekt, a.zahlungsweise as zahlungsweise,
//$groupby=" GROUP by z.adresse_abrechnung ";
+ // gesamt anzahl
+
+ $count = "SELECT COUNT(id) FROM user";
+ break;
+ case "usertemplatelist":
+ $allowed['user'] = array('list');
+ $allowed['benutzer'] = array('list');
+
+ // START EXTRA checkboxen
+
+ // ENDE EXTRA checkboxen
+
+
+ // headings
+
+// $heading = array('Login','Bezeichnung', 'Beschreibung', 'Aktiv', 'Extern', 'Anzahl Rechte', 'Hardware', 'Menü');
+ $heading = array('Bezeichnung', 'Beschreibung', 'Menü');
+ $width = array('20%' ,'50%', '10%');
+// $findcols = array('u.username','u.type' ,'a.name', "if(u.activ,'ja','-')", "if(u.externlogin,'erlaubt','-')", "IF(u.type = 'standard', (SELECT COUNT(ur.id) FROM userrights ur WHERE ur.user = u.id), 'alle')", 'u.hwtoken', 'u.id'); //'a.name','a.kundennummer',"SUM(TIME_TO_SEC(TIMEDIFF(z.bis, z.von)))/3600",'id');
+ $findcols = array('id','bezeichnung' ,'beschreibung');
+
+ $searchsql = array('id','bezeichnung', 'beschreibung');
+ $defaultorder = 1; //Optional wenn andere Reihenfolge gewuenscht
+
+ $defaultorderdesc = 0;
+ $menu = "";
+
+ // SQL statement
+// $sql = "SELECT SQL_CALC_FOUND_ROWS u.id, u.username as login, u.type, a.name as beschreibung, if(u.activ,'ja','-') as aktiv, if(u.externlogin,'erlaubt','-') as extern, IF(u.type = 'standard' OR u.type = 'lightuser', (SELECT COUNT(ur.id) FROM userrights ur WHERE ur.user = u.id), 'alle') as anzahlrechte,
+ $sql = "SELECT SQL_CALC_FOUND_ROWS id, bezeichnung, beschreibung, id FROM uservorlage";
+ $where = ""; // z.abrechnen=1 AND z.abgerechnet!=1 AND a.id > 0 ";
+
+
+ //$groupby=" GROUP by z.adresse_abrechnung ";
+
+
// gesamt anzahl
$count = "SELECT COUNT(id) FROM user";
diff --git a/www/pages/content/uservorlage_edit.tpl b/www/pages/content/uservorlage_edit.tpl
new file mode 100644
index 00000000..5248b298
--- /dev/null
+++ b/www/pages/content/uservorlage_edit.tpl
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[VORRECHTE]
+
+[NACHRECHTE]
+
+
+
+[MESSAGE]
+
+
+
+
+
+
+
+
+
+
+
+
{|Benutzervorlage \"$benutzervorlage\" ist in Benutzung durch ".$usernames.".|}
");
+ } else {
+ $this->app->DB->Delete("DELETE FROM `uservorlage` WHERE `id` = '{$id}'");
+ $this->app->DB->Delete("DELETE FROM `uservorlagerights` WHERE `vorlage` = '{$id}'");
+ $this->app->Tpl->Set('MESSAGE', "Die Benutzervorlage \"$benutzervorlage\" wurde gelöscht.
");
+ }
+
+ $this->UservorlageList();
+ }
+
+ function UservorlageCreate()
+ {
+ $this->app->erp->MenuEintrag("index.php?module=uservorlage&action=list","Zurück zur Übersicht");
+
+ $input = $this->GetInput();
+ $submit = $this->app->Secure->GetPOST('submituservorlage');
+
+ $error = '';
+ $maxlightuser = 0;
+
+ if($submit!='') {
+
+ if($input['bezeichnung']=='') {
+ $error .= 'Geben Sie bitte einen Vorlagennamen ein.
';
+ }
+ if($this->app->DB->Select("SELECT '1' FROM `uservorlage` WHERE bezeichnung='{$input['bezeichnung']}' LIMIT 1")=='1') {
+ $error .= "Es existiert bereits eine Vorlage mit diesem Namen";
+ }
+
+ if($error!=='')
+ $this->app->Tpl->Set('MESSAGE', "$error
");
+ else {
+
+ $id = $this->app->erp->CreateBenutzerVorlage($input);
+
+ $msg = $this->app->erp->base64_url_encode("Die Benutzervorlage wurde erfolgreich angelegt.
");
+ header("Location: index.php?module=uservorlage&action=edit&id=$id&msg=$msg");
+ exit;
+ }
+ }
+
+ $this->SetInput($input);
+
+ $this->app->Tpl->Set('ACTIVCHECKED',"checked");
+ $this->app->Tpl->Set('VORRECHTE',"");
+ $extra = '
+ if($(\'#hwtoken\').val() == \'4\' || $(\'#hwtoken\').val() == \'5\')
+ {
+ message = \'\';
+ }
+ ';
+ $this->app->YUI->PasswordCheck('password', 'repassword', 'username', 'submit', $extra);
+ $this->app->Tpl->Parse('PAGE', "uservorlage_edit.tpl");
+ }
+
+ function UservorlageEdit()
+ {
+ $id = $this->app->Secure->GetGET('id');
+ $this->app->Tpl->Set('ID', $id);
+
+ // JSON Upload
+ $jsonvorlage = $_FILES['jsonvorlage']['tmp_name'];
+ if($jsonvorlage!="")
+ {
+ $content = file_get_contents($jsonvorlage);
+ $tmp = json_decode($content);
+ $neuerechte=0;
+
+ $anzahl = count($tmp->{'rechte'});
+ for($i=0;$i<=$anzahl;$i++)
+ {
+ $tmpmodule = $this->app->DB->real_escape_string($tmp->{'rechte'}[$i]->{'module'});
+ $tmpaction = $this->app->DB->real_escape_string($tmp->{'rechte'}[$i]->{'action'});
+
+ if($tmpmodule!="" && $tmpaction!="")
+ {
+ $check = $this->app->DB->Select("SELECT id FROM uservorlagerights WHERE module='".$tmpmodule."' AND action='".$tmpaction."' AND vorlage='".$id."' LIMIT 1");
+
+ if($check > 0)
+ $this->app->DB->Update("UPDATE uservorlagerights SET permission=1 WHERE module='".$tmpmodule."' AND action='".$tmpaction."' AND vorlage='".$id."' LIMIT 1");
+ else {
+ $neuerechte++;
+ $this->app->DB->Insert("INSERT INTO uservorlagerights (id,module,action,vorlage,permission) VALUES ('','".$tmpmodule."','".$tmpaction."','$id','1')");
+ }
+ }
+ }
+ $msg = $this->app->erp->base64_url_encode("Es wurden $neuerechte neue Rechte der Vorlage hinzugefügt!
");
+ header("Location: index.php?module=uservorlage&action=edit&id=$id&msg=$msg");
+ exit;
+ }
+ // END JSON Upload
+
+ $this->app->erp->MenuEintrag("index.php?module=uservorlage&action=edit&id=$id","Details");
+ $this->app->erp->MenuEintrag("index.php?module=uservorlage&action=list","Zurück zur Übersicht");
+ $id = $this->app->Secure->GetGET('id');
+ $input = $this->GetInput();
+ $submit = $this->app->Secure->GetPOST('submituservorlage');
+
+ // Input GET
+ if(is_numeric($id) && $submit!='') {
+ $error = '';
+ if ($input['bezeichnung']=='') {
+ $error .= 'Geben Sie bitte eine Bezeichnung ein.
';
+ }
+ else {
+
+ $this->app->DB->Update(
+ sprintf(
+ "UPDATE `uservorlage`
+ SET bezeichnung='%s',
+ beschreibung='%s'
+ WHERE id=%d
+ LIMIT 1",
+ $input['bezeichnung'],
+ $input['beschreibung'],
+ $id
+ )
+ );
+
+ $this->app->Tpl->Set('MESSAGE', "Die Einstellungen wurden erfolgreich übernommen.
");
+
+ $this->app->erp->AbgleichBenutzerVorlagen($id);
+ }
+ } // END Input Get
+
+ $benutzervorlage = $this->app->DB->Select("SELECT bezeichnung FROM `uservorlage` WHERE id='$id' LIMIT 1");
+ $beschreibung = $this->app->DB->Select("SELECT beschreibung FROM `uservorlage` WHERE id='$id' LIMIT 1");
+ $this->app->Tpl->Add('KURZUEBERSCHRIFT2',$benutzervorlage);
+ $this->app->Tpl->Add('BEZEICHNUNG',$benutzervorlage);
+ $this->app->Tpl->Add('BESCHREIBUNG',$beschreibung);
+
+ $this->UserRights();
+ $this->app->Tpl->Parse('PAGE', "uservorlage_edit.tpl");
+ }
+
+ /**
+ * @return array
+ */
+ public function GetInput(): array
+ {
+ $input = array();
+ $input['bezeichnung'] = $this->app->Secure->GetPOST('bezeichnung');
+ $input['beschreibung'] = $this->app->Secure->GetPOST('beschreibung');
+
+ return $input;
+ }
+
+ function SetInput($input)
+ {
+ $this->app->Tpl->Set('BEZEICHNUNG', $input['bezeichnung']);
+ $this->app->Tpl->Set('BESCHREIBUNG', $input['beschreibung']);
+ }
+
+ function UserRights()
+ {
+ $id = $this->app->Secure->GetGET('id');
+ $template = $this->app->Secure->GetPOST('bezeichnung');
+ $copytemplate = $this->app->Secure->GetPOST('copyusertemplate');
+
+ $modules = $this->ScanModules();
+
+ {
+
+ if($template!='') {
+ $mytemplate = $this->app->Conf->WFconf['permissions'][$template];
+ $permissions = $this->app->DB->SelectArr("SELECT module,action FROM uservorlagerights WHERE `vorlage`=$id");
+ $this->app->DB->Delete("DELETE FROM uservorlagerights WHERE `vorlage`='$id'");
+
+ $modulecount = (!empty($modules)?count($modules):0);
+ $curModule = 0;
+
+ foreach($modules as $module=>$actions) {
+ $lower_m = strtolower($module);
+ $curModule++;
+ $actioncount = (!empty($actions)?count($actions):0);
+ for($i=0;$i<$actioncount;$i++) {
+ $delimiter = (($curModule<$modulecount || $i+1<$actioncount) ? ', ' : ';');
+ $active = ((isset($mytemplate[$lower_m]) && in_array($actions[$i], $mytemplate[$lower_m])) ? '1' : '0');
+ if($active==1){
+ $this->app->DB->Insert("INSERT INTO uservorlagerights (`vorlage`, module, action, permission) VALUES ('$id', '$lower_m', '{$actions[$i]}', '$active')");
+ }
+ }
+ }
+ }
+
+ if($copytemplate!='') {
+ $ok = true;
+ if($ok)
+ {
+ $permissions = $this->app->DB->SelectArr("SELECT module,action FROM uservorlagerights WHERE `vorlage`=$id");
+ $this->app->DB->Delete("DELETE FROM uservorlagerights WHERE `vorlage`='$id'");
+ $permissions = $this->app->DB->SelectArr("SELECT module,action FROM userrights WHERE vorlage=$copytemplate");
+ $this->app->DB->Update("INSERT INTO uservorlagerights (`vorlage`, module,action,permission) (SELECT '$id',module, action,permission FROM uservorlagerights WHERE vorlage='".$copytemplate."')");
+ }
+ }
+ }
+
+ $dbrights = $this->app->DB->SelectArr("SELECT module, action, permission FROM uservorlagerights WHERE `vorlage`='$id' ORDER BY module");
+
+ $rights = $this->app->Conf->WFconf['permissions'][$group];
+ if ((!empty($dbrights)?count($dbrights):0)>0) {
+ $rights = $this->AdaptRights($dbrights, $rights, $group);
+ }
+
+ $modules = $this->ScanModules();
+ $table = $this->CreateTable($id, $modules, $rights);
+
+ $this->app->Tpl->Set('MODULES', $table);
+ }
+
+/*
+ Ajax handler
+*/
+ function UservorlageChangeRights()
+ {
+ $vorlage = $this->app->Secure->GetGET('b_vorlage');
+ $module = $this->app->Secure->GetGET('b_module');
+ $action = $this->app->Secure->GetGET('b_action');
+ $value = $this->app->Secure->GetGET('b_value');
+
+ if(is_numeric($vorlage) && $module!='' && $action!='' && $value!='') {
+
+ $id = $this->app->DB->Select("SELECT id FROM uservorlagerights WHERE vorlage='$vorlage' AND module='$module' AND action='$action' LIMIT 1");
+
+ if(is_numeric($id) && $id>0)
+ {
+ if($value=="1")
+ {
+ $this->app->DB->Update("UPDATE uservorlagerights SET permission=1 WHERE id='$id' LIMIT 1");
+ }
+ else {
+ $this->app->DB->Delete("DELETE FROM uservorlagerights WHERE vorlage='$vorlage' AND module='$module' AND action='$action'");
+ }
+ }
+ else
+ $this->app->DB->Insert("INSERT INTO uservorlagerights (vorlage, module, action, permission) VALUES ('$vorlage', '$module', '$action', '$value')");
+ }
+
+ echo $this->app->DB->Select("SELECT permission FROM uservorlagerights WHERE vorlage='$vorlage' AND module='$module' AND action='$action' LIMIT 1");
+ exit;
+ }
+
+ function AdaptRights($dbarr, $rights)
+ {
+ $cnt = (!empty($dbarr)?count($dbarr):0);
+ for($i=0;$i<$cnt;$i++) {
+ $module = $dbarr[$i]['module'];
+ $action = $dbarr[$i]['action'];
+ $perm = $dbarr[$i]['permission'];
+
+ if(isset($rights[$module])) {
+ if($perm=='1' && !in_array($action, $rights[$module]))
+ $rights[$module][] = $action;
+
+ if($perm=='0' && in_array($action, $rights[$module])) {
+ $index = array_search($action, $rights[$module]);
+ unset($rights[$module][$index]);
+ $rights[$module] = array_values($rights[$module]);
+ }
+ }else if($perm=='1') $rights[$module][] = $action;
+ }
+ return $rights;
+ }
+
+ function CreateTable($user, $modules, $rights)
+ {
+ $maxcols = 6;
+ $width = 100 / $maxcols;
+ $out = '';
+ foreach($modules as $key=>$value) {
+ if(strtolower($key) == 'api' || strtolower($key) == 'ajax')continue;
+ $out .= "| $key |
";
+
+ $out .= "";
+ $module = strtolower($key);
+ for($i=0;$i<$maxcols || $i<(!empty($value)?count($value):0);$i++) {
+ if($i%$maxcols==0) $out .= "";
+
+ if (gettype($rights[$module]) == 'array') {
+
+ if(isset($value[$i]) && in_array($value[$i], $rights[$module])) {
+ $class = 'class="blue"';
+ $active = '1';
+ }else{
+ $class = 'class="grey"';
+ $active = 0;
+ }
+ } else {
+ $class = 'class="grey"';
+ $active = 0;
+ }
+
+ $class = ((isset($value[$i])) ? $class : '');
+
+ $action = ((isset($value[$i])) ? strtolower($value[$i]) : '');
+ $onclick = ((isset($value[$i])) ? "onclick=\"ChangeRights(this, '$user','$module','$action')\"" : '');
+ $out .= "| {$action} | ";
+
+ if($i%$maxcols==($maxcols-1)) $out .= " ";
+ }
+ $out .= " |
";
+ }
+
+ return $out;
+ }
+
+ /**
+ * @param string $page
+ * @param array $actions
+ *
+ * @return array
+ */
+ public function getActionsFromFile($page, $actions = [])
+ {
+ if(substr($page,-8) === '.src.php') {
+ return $actions;
+ }
+ $content = file_get_contents($page);
+ $foundItems = preg_match_all('/ActionHandler\([\"|\\\'][[:alnum:]].*[\"|\\\'],/', $content, $matches);
+ if($foundItems <= 0) {
+ return $actions;
+ }
+ $action = str_replace(array('ActionHandler("','ActionHandler(\'','",' , '\',' ),'', $matches[0]);
+ if(empty($action) || !is_array($action)) {
+ return $actions;
+ }
+ if(isset($actions)) {
+ $actionsCount = $action ? count($action) : 0;
+ for ($i = 0; $i < $actionsCount; $i++) {
+ if(empty($action[$i])) {
+ continue;
+ }
+ $found = false;
+ foreach ($actions as $v) {
+ if($v == $action[$i]){
+ $found = true;
+ break;
+ }
+ }
+ if(!$found){
+ $actions[] = $action[$i];
+ }
+ }
+ }
+ else{
+ $actionsCount = $action ? count($action) : 0;
+ for ($i = 0; $i < $actionsCount; $i++) {
+ $actions[] = $action[$i];
+ }
+ }
+ sort($actions);
+
+ return $actions;
+ }
+
+ /**
+ * @return array
+ */
+ public function ScanModules()
+ {
+ //$files = glob('./pages/*.php');
+ $files = glob(__DIR__.'/*.php');
+ $encodedActions = [];
+ if(method_exists($this->app->erp,'getEncModullist')) {
+ $encodedActions = $this->app->erp->getEncModullist();
+ }
+ if(empty($encodedActions)) {
+ $encodedActions = [];
+ }
+ $modules = array();
+ if(empty($files)) {
+ return $encodedActions;
+ }
+ foreach($files as $page) {
+ $name = ucfirst(str_replace('_custom','',basename($page,'.php')));
+ if(substr($page,-8) === '.src.php') {
+ continue;
+ }
+
+ $modules[$name] = $this->getActionsFromFile($page, isset($modules[$name]) ? $modules[$name]: []);
+
+ if(!empty($encodedActions[$name]) && is_array($encodedActions[$name]) && count($encodedActions[$name]) > 0) {
+ if(isset($modules[$name])) {
+ $encodedActionsCount = $encodedActions[$name]?count($encodedActions[$name]):0;
+ for($i=0;$i<$encodedActionsCount;$i++) {
+ $found = false;
+ foreach($modules[$name] as $moduleAction) {
+ if($moduleAction == $encodedActions[$name][$i]) {
+ $found = true;
+ break;
+ }
+ }
+ if(!$found) {
+ $modules[$name][] = $encodedActions[$name][$i];
+ }
+ }
+ }
+ else{
+ $modules[$name] = $encodedActions[$name];
+ }
+ sort($modules[$name]);
+ }
+ }
+
+ foreach($modules as $name => $actions) {
+ if(empty($actions)) {
+ unset($modules[$name]);
+ }
+ }
+
+ return $modules;
+ }
+
+ function TemplateSelect()
+ {
+ $options = "";
+ foreach($this->Templates as $key=>$value) {
+ if($key!="web")
+ $options .= "";
+ }
+
+ return $options;
+ }
+
+ function GetTemplates()
+ {
+ return $this->app->Conf->WFconf['permissions'];
+ }
+}