Fix crepair links
authornupplaPhil <admin+github@philipp.info>
Sun, 2 Feb 2020 19:50:53 +0000 (20:50 +0100)
committernupplaPhil <admin+github@philipp.info>
Sun, 2 Feb 2020 19:50:53 +0000 (20:50 +0100)
src/Module/Contact.php
view/theme/frio/templates/contact/advanced.tpl [new file with mode: 0644]
view/theme/frio/templates/crepair.tpl [deleted file]

index 7ce47b9..020e390 100644 (file)
@@ -374,7 +374,7 @@ class Contact extends BaseModule
 
                        if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
                                self::updateContactFromProbe($contact_id);
-                               DI::baseUrl()->redirect('crepair/' . $contact_id);
+                               DI::baseUrl()->redirect('contact/' . $contact_id . '/advanced/');
                                // NOTREACHED
                        }
 
@@ -910,7 +910,7 @@ class Contact extends BaseModule
 
                if (!empty($contact['uid'])) {
                        $tabs[] = ['label' => DI::l10n()->t('Advanced'),
-                               'url'   => 'crepair/' . $contact['id'],
+                               'url'   => 'contact/' . $contact['id'] . '/advanced/',
                                'sel'   => (($active_tab == 6) ? 'active' : ''),
                                'title' => DI::l10n()->t('Advanced Contact Settings'),
                                'id'    => 'advanced-tab',
diff --git a/view/theme/frio/templates/contact/advanced.tpl b/view/theme/frio/templates/contact/advanced.tpl
new file mode 100644 (file)
index 0000000..5c814e5
--- /dev/null
@@ -0,0 +1,56 @@
+
+<div id="crepair" class="generic-page-wrapper">
+       {{include file="section_title.tpl"}}
+
+       {{$tab_str nofilter}}
+
+       <div class="crepair-error-message">{{$warning nofilter}}</div><br>
+       <div class="crepair-return">
+               {{$info nofilter}}<br>
+               <!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
+       </div>
+       <br />
+
+       <form id="crepair-form" action="contact/{{$contact_id}}/advanced" method="post" >
+
+               <!-- <h4>{{$contact_name}}</h4> -->
+
+               <div id="contact-update-profile-wrapper">
+               {{if $update_profile}}
+                       <span id="contact-update-profile-now" class="button"><a href="contact/{{$contact_id}}/updateprofile" >{{$udprofilenow}}</a></span>
+               {{/if}}
+               </div>
+
+               {{include file="field_input.tpl" field=$name}}
+
+               {{include file="field_input.tpl" field=$nick}}
+
+               {{include file="field_input.tpl" field=$attag}}
+
+               {{include file="field_input.tpl" field=$url}}
+
+               {{include file="field_input.tpl" field=$alias}}
+
+               {{include file="field_input.tpl" field=$request}}
+
+               {{include file="field_input.tpl" field=$confirm}}
+
+               {{include file="field_input.tpl" field=$notify}}
+
+               {{include file="field_input.tpl" field=$poll}}
+
+               {{include file="field_input.tpl" field=$photo}}
+
+
+               {{if $allow_remote_self eq 1}}
+               <h4>{{$label_remote_self}}</h4>
+               {{include file="field_select.tpl" field=$remote_self}}
+               {{/if}}
+
+               <div class="pull-right settings-submit-wrapper" >
+                       <button type="submit" name="submit" class="btn btn-primary" value="{{$lbl_submit}}">{{$lbl_submit}}</button>
+               </div>
+               <div class="clear"></div>
+
+       </form>
+</div>
diff --git a/view/theme/frio/templates/crepair.tpl b/view/theme/frio/templates/crepair.tpl
deleted file mode 100644 (file)
index df49762..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-
-<div id="crepair" class="generic-page-wrapper">
-       {{include file="section_title.tpl"}}
-
-       {{$tab_str nofilter}}
-
-       <div class="crepair-error-message">{{$warning nofilter}}</div><br>
-       <div class="crepair-return">
-               {{$info nofilter}}<br>
-               <!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
-       </div>
-       <br />
-
-       <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
-
-               <!-- <h4>{{$contact_name}}</h4> -->
-
-               <div id="contact-update-profile-wrapper">
-               {{if $update_profile}}
-                       <span id="contact-update-profile-now" class="button"><a href="contact/{{$contact_id}}/updateprofile" >{{$udprofilenow}}</a></span>
-               {{/if}}
-               </div>
-
-               {{include file="field_input.tpl" field=$name}}
-
-               {{include file="field_input.tpl" field=$nick}}
-
-               {{include file="field_input.tpl" field=$attag}}
-
-               {{include file="field_input.tpl" field=$url}}
-
-               {{include file="field_input.tpl" field=$alias}}
-
-               {{include file="field_input.tpl" field=$request}}
-
-               {{include file="field_input.tpl" field=$confirm}}
-
-               {{include file="field_input.tpl" field=$notify}}
-
-               {{include file="field_input.tpl" field=$poll}}
-
-               {{include file="field_input.tpl" field=$photo}}
-
-
-               {{if $allow_remote_self eq 1}}
-               <h4>{{$label_remote_self}}</h4>
-               {{include file="field_select.tpl" field=$remote_self}}
-               {{/if}}
-
-               <div class="pull-right settings-submit-wrapper" >
-                       <button type="submit" name="submit" class="btn btn-primary" value="{{$lbl_submit}}">{{$lbl_submit}}</button>
-               </div>
-               <div class="clear"></div>
-
-       </form>
-</div>