diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-28 21:02:27 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-28 21:02:27 -0700 |
| commit | bb96f44861c66e9eb334e18e4b4b659685433008 (patch) | |
| tree | 1f1d7b789829502c61a8a3defbecf37bc4a5dba9 /Zotlabs/Module | |
| parent | 30a6ae3daa42da8d1d9560fcc4c706b3e41c4d80 (diff) | |
| download | volse-hubzilla-bb96f44861c66e9eb334e18e4b4b659685433008.tar.gz volse-hubzilla-bb96f44861c66e9eb334e18e4b4b659685433008.tar.bz2 volse-hubzilla-bb96f44861c66e9eb334e18e4b4b659685433008.zip | |
allow engineering units (e.g. 400M, 1G) as service class limits
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Item.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Photos.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 74fbeed67..93570fdec 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -1243,14 +1243,14 @@ class Item extends \Zotlabs\Web\Controller { } if (!$iswebpage) { - $max = service_class_fetch($channel_id,'total_items'); + $max = engr_units_to_bytes(service_class_fetch($channel_id,'total_items')); if(! service_class_allows($channel_id,'total_items',$r[0]['total'])) { $result['message'] .= upgrade_message() . sprintf( t('You have reached your limit of %1$.0f top level posts.'),$max); return $result; } } else { - $max = service_class_fetch($channel_id,'total_pages'); + $max = engr_units_to_bytes(service_class_fetch($channel_id,'total_pages')); if(! service_class_allows($channel_id,'total_pages',$r[0]['total'])) { $result['message'] .= upgrade_message() . sprintf( t('You have reached your limit of %1$.0f webpages.'),$max); return $result; diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index ce350666f..15a1f4d9c 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -615,7 +615,7 @@ class Photos extends \Zotlabs\Web\Controller { ); - $limit = service_class_fetch(\App::$data['channel']['channel_id'],'photo_upload_limit'); + $limit = engr_units_to_bytes(service_class_fetch(\App::$data['channel']['channel_id'],'photo_upload_limit')); if($limit !== false) { $usage_message = sprintf( t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000 ); } |