diff --git a/src/application/controller/follow.php b/src/application/controller/people.php similarity index 90% rename from src/application/controller/follow.php rename to src/application/controller/people.php index 02e9865..d2cf68a 100644 --- a/src/application/controller/follow.php +++ b/src/application/controller/people.php @@ -20,7 +20,7 @@ $metaScripts = [ 'js/module/post.js', 'js/module/feed.js', 'js/module/following.js', - 'js/follow.js', + 'js/people.js', ]; // Auto-following @@ -33,4 +33,4 @@ if (isset($_GET['_route_'])) { } } -require(PROJECT_DIR . '/application/view/follow.phtml'); \ No newline at end of file +require(PROJECT_DIR . '/application/view/people.phtml'); \ No newline at end of file diff --git a/src/application/view/common/module/menu.phtml b/src/application/view/common/module/menu.phtml index 8c615a9..87134d2 100644 --- a/src/application/view/common/module/menu.phtml +++ b/src/application/view/common/module/menu.phtml @@ -1,7 +1,7 @@
- + diff --git a/src/application/view/follow.phtml b/src/application/view/people.phtml similarity index 100% rename from src/application/view/follow.phtml rename to src/application/view/people.phtml diff --git a/src/bootstrap.php b/src/bootstrap.php index 0341798..6ec7c37 100644 --- a/src/bootstrap.php +++ b/src/bootstrap.php @@ -63,11 +63,6 @@ if (isset($_GET['_route_'])) { case 'logout': require(PROJECT_DIR . '/application/controller/logout.php'); break; - /* - case 'follow': - require(PROJECT_DIR . '/application/controller/follow.php'); - break; - */ case 'register': require(PROJECT_DIR . '/application/controller/register.php'); break; @@ -101,8 +96,8 @@ if (isset($_GET['_route_'])) { switch (true) { // Pages - case preg_match('|^follow[/\w_]?|i', $_GET['_route_']): - require(PROJECT_DIR . '/application/controller/follow.php'); + case preg_match('|^people[/\w_]?|i', $_GET['_route_']): + require(PROJECT_DIR . '/application/controller/people.php'); break; // 404 diff --git a/src/public/js/module/feed.js b/src/public/js/module/feed.js index 19cd67d..038e786 100644 --- a/src/public/js/module/feed.js +++ b/src/public/js/module/feed.js @@ -14,7 +14,7 @@ var ModuleFeed = { 'class': 'info' }).append( $('', { - 'href': 'follow/' + reTwist.userName + 'href': 'people/' + reTwist.userName }).append(reTwist.userName) ).append( $('', { @@ -34,7 +34,7 @@ var ModuleFeed = { 'class': 'avatar' }).append( $('', { - 'href': 'follow/' + userName + 'href': 'people/' + userName }).append( $('', { 'src': '/api/image?hash=' + userName, @@ -50,7 +50,7 @@ var ModuleFeed = { 'class': 'info' }).append( $('', { - 'href': 'follow/' + userName + 'href': 'people/' + userName }).append(userName) ).append( $('', { diff --git a/src/public/js/module/following.js b/src/public/js/module/following.js index 42af9d1..289ce7b 100644 --- a/src/public/js/module/following.js +++ b/src/public/js/module/following.js @@ -11,7 +11,7 @@ var ModuleFollowing = { 'class': 'avatar' }).append( $('', { - 'href': 'follow/' + userName + 'href': 'people/' + userName }).append( $('', { 'src': '/api/image?hash=' + userName, @@ -24,7 +24,7 @@ var ModuleFollowing = { 'class': 'info' }).append( $('', { - 'href': 'follow/' + userName + 'href': 'people/' + userName }).append(userName) ) ).append( diff --git a/src/public/js/follow.js b/src/public/js/people.js similarity index 84% rename from src/public/js/follow.js rename to src/public/js/people.js index 8262b03..3a96d5e 100644 --- a/src/public/js/follow.js +++ b/src/public/js/people.js @@ -1,13 +1,13 @@ $(document).ready(function() { // Init modules - ModuleMenu.init('follow'); + ModuleMenu.init('people'); ModuleFollowing.load('#moduleFollowing', true); ModuleFeed.load('#moduleFeed', true); // Event listeners $(document).on('ModuleFollowing.unFollow:success', function(/*event, response*/) { - ModuleMenu.init('follow'); + ModuleMenu.init('people'); ModuleFollowing.load('#moduleFollowing', true); ModuleFeed.load('#moduleFeed', true); }); diff --git a/src/system/helper/format.php b/src/system/helper/format.php index b78fe98..96fd4a3 100644 --- a/src/system/helper/format.php +++ b/src/system/helper/format.php @@ -48,7 +48,7 @@ class Format { public static function post(string $text) { - $text = preg_replace("|@([a-zA-Z0-9_]+)|i", "@$1", $text); + $text = preg_replace("|@([a-zA-Z0-9_]+)|i", "@$1", $text); $text = preg_replace("|((https?://)?([\d\w\.-]+\.[\w\.]{2,6})[^\s\]\[\<\>]*/?)|i", "$3", $text); $text = nl2br($text);