@@ -23,7 +23,8 @@ class DefaultController extends Controller
2323
2424 public function actionIndex ()
2525 {
26- Url::remember ();
26+ $ this ->rememberUrl ();
27+
2728 $ dataProvider = new ArrayDataProvider ([
2829 'allModels ' => $ this ->module ->getLogs (),
2930 'sort ' => [
@@ -66,13 +67,13 @@ public function actionArchive($slug)
6667
6768 public function actionHistory ($ slug )
6869 {
69- Url:: remember ();
70-
70+ $ this -> rememberUrl ();
71+
7172 $ log = $ this ->find ($ slug , null );
7273 $ allLogs = $ this ->module ->getHistory ($ log );
73-
74+
7475 $ fullSize = array_sum (ArrayHelper::getColumn ($ allLogs , 'size ' ));
75-
76+
7677 $ dataProvider = new ArrayDataProvider ([
7778 'allModels ' => $ allLogs ,
7879 'sort ' => [
@@ -101,7 +102,7 @@ public function actionZip($slug)
101102 $ result = $ model ->zip ();
102103 if ($ result !== false ) {
103104 Yii::$ app ->session ->setFlash ('success ' , 'zip success ' );
104- return $ this ->redirect (Url:: previous () );
105+ return $ this ->redirectPrevious ( );
105106 } else {
106107 Yii::$ app ->session ->setFlash ('error ' , 'zip error: ' , implode ('<br> ' , $ model ->getFirstErrors ()));
107108 }
@@ -119,7 +120,7 @@ public function actionClean($slug)
119120 $ result = $ model ->clean ();
120121 if ($ result !== false ) {
121122 Yii::$ app ->session ->setFlash ('success ' , 'clean success ' );
122- return $ this ->redirect (Url:: previous () );
123+ return $ this ->redirectPrevious ( );
123124 } else {
124125 Yii::$ app ->session ->setFlash ('error ' , 'clean error: ' , implode ('<br> ' , $ model ->getFirstErrors ()));
125126 }
@@ -135,15 +136,15 @@ public function actionDelete($slug, $stamp = null, $since = null)
135136 if ($ since ) {
136137 if ($ log ->updatedAt != $ since ) {
137138 Yii::$ app ->session ->setFlash ('error ' , 'delete error: file has updated ' );
138- return $ this ->redirect (Url:: previous () );
139+ return $ this ->redirectPrevious ( );
139140 }
140141 }
141142 if (unlink ($ log ->fileName )) {
142143 Yii::$ app ->session ->setFlash ('success ' , 'delete success ' );
143144 } else {
144145 Yii::$ app ->session ->setFlash ('error ' , 'delete error ' );
145146 }
146- return $ this ->redirect (Url:: previous () );
147+ return $ this ->redirectPrevious ( );
147148 }
148149
149150 public function actionDownload ($ slug , $ stamp = null )
@@ -184,4 +185,14 @@ protected function find($slug, $stamp)
184185 throw new NotFoundHttpException ('Log not found. ' );
185186 }
186187 }
188+
189+ protected function rememberUrl ($ url = '' )
190+ {
191+ Url::remember ($ url , '__logReaderReturnUrl ' );
192+ }
193+
194+ protected function redirectPrevious ()
195+ {
196+ return $ this ->redirect (Url::previous ('__logReaderReturnUrl ' ));
197+ }
187198}
0 commit comments