save/load/delete works again

Author: splitbrain

ProfileManager.php

@@ -6,6 +6,10 @@ class ProfileManager {
 
     protected $profiles = [];
 
+    public function __construct() {
+        $this->load();
+    }
+
     /**
      * Return a list of all available profiles
      *
@@ -51,25 +55,30 @@ public function getEmptyConfig() {
             'user' => '',
             'pass' => '',
             'timeout' => 15,
+            'type' => 0,
         ];
     }
 
     /**
      * Set the given config for the given profile
      *
-     * When $num is null, the data is added to a new profile
+     * When $num is false, the data is added to a new profile
      *
-     * @param int|null $num
+     * @param int|false $num
      * @param $data
+     * @return int the index of the saved profile
      */
     public function setProfileConfig($num, $data) {
-        if($num !== null && isset($this->profiles[$num])) {
+        if($num === false || !isset($this->profiles[$num])) {
+            $num = count($this->profiles);
+        }
+        if(isset($this->profiles[$num])) {
             $this->profiles[$num] = array_merge($this->profiles[$num], $data);
         } else {
             $this->profiles[$num] = $data;
         }
-
         $this->save();
+        return $num;
     }
 
     /**
@@ -81,6 +90,8 @@ public function getProfileLabels() {
         $labels = [];
         foreach($this->profiles as $idx => $profile) {
             $label = parse_url($profile['server'], PHP_URL_HOST);
+            if($label === null) $label = $profile['server'];
+            $label = ($idx + 1) . '. ' . $label;
             if($profile['user'] !== '') $label = $profile['user'] . '@' . $label;
             if($profile['ns'] !== '') $label .= ':' . $profile['ns'];
             $labels[$idx] = $label;

admin.php

@@ -85,24 +85,27 @@ function _connect() {
      * handle profile saving/deleting
      */
     function handle() {
-        if(isset($_REQUEST['prf']) && is_array($_REQUEST['prf'])) {
-            if(isset($_REQUEST['sync__delete']) && $this->profno !== false) {
-                // delete profile
-                unset($this->profiles[$this->profno]);
-                $this->profiles = array_values($this->profiles); //reindex
-                $this->profno = '';
+        global $INPUT;
+
+        $profile = $INPUT->arr('prf');
+        if(!$profile) return;
+
+        if(!checkSecurityToken()) return;
+
+        try {
+            if($INPUT->has('sync__delete') && $this->profno !== false) {
+                // profile deletion
+                $this->profileManager->deleteProfileConfig($this->profno);
+                $this->profno = false;
+                $INPUT->remove('prf');
+                msg('profile deleted', 1);
             } else {
-                // add/edit profile
-                if($this->profno === '') $this->profno = count($this->profiles);
-                if(!isset($_REQUEST['prf']['timeout']) || !is_numeric($_REQUEST['prf']['timeout'])) {
-                    $_REQUEST['prf']['timeout'] = $this->defaultTimeout;
-                }
-                $this->profiles[$this->profno] = $_REQUEST['prf'];
+                // profile add/edit
+                $this->profno = $this->profileManager->setProfileConfig($this->profno, $profile);
+                msg('profile saved', 1);
             }
-            $this->_profileSave();
-
-            // reset the client
-            $this->client = null;
+        } catch(\dokuwiki\plugin\sync\SyncException $e) {
+            msg(hsc($e->getMessage()), -1);
         }
     }
 
@@ -211,7 +214,7 @@ protected function profileDropdown() {
         $profiles[''] = $this->getLang('newprofile');
 
         $form->addFieldsetOpen($this->getLang('profile'));
-        $form->addDropdown('no', $profiles);
+        $form->addDropdown('no', $profiles)->val($this->profno);
         $form->addButton('', $this->getLang('select'));
         $form->addFieldsetClose();
 
@@ -226,6 +229,7 @@ protected function profileForm() {
             [
                 'action' => wl('', ['do' => 'admin', 'page' => 'sync'], false, '&'),
                 'method' => 'POST',
+                'class' => 'sync_profile',
             ]
         );
 
@@ -238,15 +242,15 @@ protected function profileForm() {
         }
 
         $depths = [
-            0 => $this->getLang('level0'),
-            1 => $this->getLang('level1'),
-            2 => $this->getLang('level2'),
-            3 => $this->getLang('level3'),
+            ['label' => $this->getLang('level0'), 'attr' => ['value' => '0']],
+            ['label' => $this->getLang('level1'), 'attr' => ['value' => '1']],
+            ['label' => $this->getLang('level2'), 'attr' => ['value' => '2']],
+            ['label' => $this->getLang('level3'), 'attr' => ['value' => '3']],
         ];
         $types = [
-            0 => $this->getLang('type0'),
-            1 => $this->getLang('type1'),
-            2 => $this->getLang('type2'),
+            ['label' => $this->getLang('type0'), 'attr' => ['value' => '0']],
+            ['label' => $this->getLang('type1'), 'attr' => ['value' => '1']],
+            ['label' => $this->getLang('type2'), 'attr' => ['value' => '2']],
         ];
 
         $form->addFieldsetOpen($legend);
@@ -261,9 +265,9 @@ protected function profileForm() {
         $form->addDropdown('prf[type]', $types, $this->getLang('type'))->val($profile['type']);
         $form->addButton('', $this->getLang('save'))->attr('type', 'submit');
 
-//        if($no !== '' && $this->profiles[$no]['ltime']) {
-//            echo '<small>' . $this->getLang('changewarn') . '</small>';
-//        }
+        if($this->profno !== false && !empty($profile['ltime'])) {
+            echo '<small>' . $this->getLang('changewarn') . '</small>';
+        }
 
         $form->addFieldsetClose();