removed the services/caches/capabilities method

Author: following5

okapi/core/OkapiServiceRunner.php

@@ -33,7 +33,7 @@ class OkapiServiceRunner
         'services/caches/search/by_urls',
         'services/caches/search/save',
         'services/caches/shortcuts/search_and_retrieve',
-        'services/caches/capabilities',
+     // 'services/caches/capabilities',
         'services/caches/edit',
         'services/caches/geocache',
         'services/caches/geocaches',

okapi/services/apisrv/installation/WebService.php

@@ -31,20 +31,8 @@ public static function call(OkapiRequest $request)
         $result['image_max_upload_size'] = Settings::get('IMAGE_MAX_UPLOAD_SIZE');
         $result['image_rcmd_max_pixels'] = Settings::get('IMAGE_MAX_PIXEL_COUNT');
         $result['has_image_positions'] = Settings::get('OC_BRANCH') == 'oc.de';
-
-        # 'geocache_passwd_max_length' was replaced by 'password_max_length'
-        # in the new services/caches/capabilities method. It had never been
-        # in use at OCPL sites (services/caches/edit was never called).
-        # We leave it here as undocumented OCDE field, until we can verify
-        # if it was in use there. If no - drop it. If yes - document it as a
-        # deprecated OCDE-only field.
-
-        # Note that for backward compatibility with a former Db::field_length()
-        # bug, the OCDE field is of type string, while the OCPL field was
-        # (as intended) numeric.
-
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-            $result['geocache_passwd_max_length'] = (string)Db::field_length('caches', 'logpw');
+        $result['has_ratings'] = Settings::get('OC_BRANCH') == 'oc.pl';
+        $result['geocache_passwd_max_length'] = Db::field_length('caches', 'logpw');
 
         return Okapi::formatted_response($request, $result);
     }

okapi/services/apisrv/installation/docs.xml

@@ -97,6 +97,16 @@
                 <p><b>has_image_positions</b> - boolean, <b>true</b> if this
                 installations supports arbitrary ordering of uploaded images.</p>
             </li>
+            <li>
+                <p><b>has_ratings</b> - boolean, <b>true</b> if this installation
+                can store geocache quality ratings. Use the
+                <a href='%OKAPI:methodargref:services/logs/capabilities%'>services/logs/capabilities</a>
+                method to find out if a given geocache can be rated.</p>
+            </li>
+            <li>
+                <p><b>geocache_passwd_max_length</b> - the maximum length
+                of geocache log passwords.</p>
+            </li>
         </ul>
     </returns>
 </xml>

okapi/services/caches/edit/docs.xml

@@ -14,7 +14,7 @@
         If you supply an empty string, the password will be cleared, i.e.
         the geocache will not require a log password.</p>
         <p>You may query the maximum accepted password length for the OC site by
-        <a href='%OKAPI:methodargref:services/caches/capabilities%'>services/caches/capabilities</a>.
+        <a href='%OKAPI:methodargref:services/apisrv/installation%'>services/apisrv/installation</a>.
         There may also be installation-dependent restrictions on which
         geocaches may have passwords. <b>success</b> will be <b>false</b> and
         an explanation message will be returned if a password is rejected.</p>

okapi/services/caches/search/all/docs.xml

@@ -18,11 +18,9 @@
     </desc>
     <opt name='type'>
         <p>Pipe-separated list of cache type codes. If given, the results will be
-        limited to the given cache types. For a list of available type codes,
-        see the <b>types</b> return field of
-        <a href='%OKAPI:methodargref:services/caches/capabilities%'>services/caches/capabilities</a>.
-        For more information on cache types, see
-        <a href='%OKAPI:methodargref:services/caches/geocache%'>services/caches/geocache</a>.</p>
+        limited to the given cache types. For a list of known types, see the
+        <a href='%OKAPI:methodargref:services/caches/geocache%'>services/caches/geocache</a>
+        <b>type</b> field.</p>
 
         <p><b>Note:</b> If you want to include all cache types <b>except</b>
         the given ones, prepend your list with the "-" sign.</p>
@@ -38,9 +36,7 @@
             <li><b>Archived</b> - Cache is permanently unavailable (moved to the archives).</li>
         </ul>
         <p>More statuses are in use at OC sites and may be implemented in future
-        OKAPI versions (see <a href="https://github.com/opencaching/okapi/issues/565">discussion</a>).
-        The <a href='%OKAPI:methodargref:services/caches/capabilities%'>services/caches/capabilities</a>
-        method returns a list of statuses that can be searched for.</p>
+        OKAPI versions (see <a href="https://github.com/opencaching/okapi/issues/565">discussion</a>).</p>
     </opt>
     <opt name='owner_uuid'>
         <p>Pipe-separated list of user IDs. If given, the list of returned caches
@@ -101,12 +97,6 @@
         included. The codes are: 'none', 'nano', 'micro', 'small', 'regular',
         'large', 'xlarge', 'other'.</p>
 
-        <p><b>Note:</b> Not all OC servers use all of these. The <b>sizes</b>
-        field of <a href='%OKAPI:methodargref:services/caches/capabilities%'>services/caches/capabilities</a>
-        tells which types are currently available at this installation. You
-        may also search for sizes which are unavailable here; then the result
-        will be empty.</p>
-
         <p><b>Note:</b> If you want to include all cache sizes <b>except</b>
         the given ones, prepend your list with the "-" sign.</p>
     </opt>
@@ -124,7 +114,7 @@
 
         <p><b>Note:</b> Not all Opencaching installations provide ratings for their
         geocaches. The <b>has_ratings</b> field of
-        <a href='%OKAPI:methodargref:services/caches/capabilities%'>services/caches/capabilities</a>
+        <a href='%OKAPI:methodargref:services/apisrv/installation%'>services/apisrv/installation</a>
         tells if ratings are available. If not, this parameter will be ignored.</p>
     </opt>
     <opt name='min_rcmds'>