Completed
Push — master ( 82a288...0e6cd4 )
by kill
16:52 queued 06:50
created
core/functions/function.php 1 patch
Braces   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,8 +39,7 @@  discard block
 block discarded – undo
39 39
 {
40 40
     if(isset($arr['status']) && $type==2){
41 41
         $ret=$arr;
42
-    }
43
-    else{
42
+    } else{
44 43
         $ret['status'] = $type;
45 44
         $ret['data'] = $arr;
46 45
     }
@@ -157,7 +156,7 @@  discard block
 block discarded – undo
157 156
                 // 重新生成id
158 157
                 session_regenerate_id();
159 158
             }
160
-        }else {
159
+        } else {
161 160
             if (strpos($name, '.')) {
162 161
                 list($name1, $name2) = explode('.', $name);
163 162
                 return isset($_SESSION[$name1][$name2]) ? $_SESSION[$name1][$name2] : null;
Please login to merge, or discard this patch.
core/helpers/Dispatch.php 1 patch
Braces   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         self::init();
21 21
         if($path==''){
22 22
             $path=array();
23
-        }else{
23
+        } else{
24 24
             $path=str_replace('-','_',$path);
25 25
             $path   = explode('/',$path);
26 26
         }
@@ -28,8 +28,7 @@  discard block
 block discarded – undo
28 28
         if(count($path)==0){
29 29
             array_push($path,'home');
30 30
             array_push($path,'index');
31
-        }
32
-        elseif (count($path)==1){
31
+        } elseif (count($path)==1){
33 32
             array_push($path,'index');
34 33
         }
35 34
         if(!empty($path)){
Please login to merge, or discard this patch.
core/helpers/Page.php 1 patch
Braces   +33 added lines, -30 removed lines patch added patch discarded remove patch
@@ -133,71 +133,74 @@
 block discarded – undo
133 133
                 $ext=$this->getParam();
134 134
             }
135 135
             $pagination .= "<ul class='pager'>";
136
-            if ($this->_page > 1)
137
-                $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
138
-            else
139
-                $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
136
+            if ($this->_page > 1) {
137
+                            $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
138
+            } else {
139
+                            $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
140
+            }
140 141
 
141 142
             if ($lastpage < 7 + ($adjacents * 2))
142 143
             {
143 144
                 for ($counter = 1; $counter <= $lastpage; $counter++)
144 145
                 {
145
-                    if ($counter == $this->_page)
146
-                        $pagination.= "<li class='current'><span>$counter</span></li>";
147
-                    else
148
-                        $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
146
+                    if ($counter == $this->_page) {
147
+                                            $pagination.= "<li class='current'><span>$counter</span></li>";
148
+                    } else {
149
+                                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
150
+                    }
149 151
                 }
150
-            }
151
-            elseif($lastpage > 5 + ($adjacents * 2))
152
+            } elseif($lastpage > 5 + ($adjacents * 2))
152 153
             {
153 154
                 if($this->_page < 1 + ($adjacents * 2))
154 155
                 {
155 156
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
156 157
                     {
157
-                        if ($counter == $this->_page)
158
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
159
-                        else
160
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
158
+                        if ($counter == $this->_page) {
159
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
160
+                        } else {
161
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
162
+                        }
161 163
                     }
162 164
                     $pagination.= "...";
163 165
                     $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
164 166
                     $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
165
-                }
166
-                elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
167
+                } elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
167 168
                 {
168 169
                     $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
169 170
                     $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
170 171
                     $pagination.= "...";
171 172
                     for ($counter = $this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
172 173
                     {
173
-                        if ($counter == $this->_page)
174
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
175
-                        else
176
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
174
+                        if ($counter == $this->_page) {
175
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
176
+                        } else {
177
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
178
+                        }
177 179
                     }
178 180
                     $pagination.= "..";
179 181
                     $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
180 182
                     $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
181
-                }
182
-                else
183
+                } else
183 184
                 {
184 185
                     $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
185 186
                     $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
186 187
                     $pagination.= "..";
187 188
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
188 189
                     {
189
-                        if ($counter == $this->_page)
190
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
191
-                        else
192
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
190
+                        if ($counter == $this->_page) {
191
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
192
+                        } else {
193
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
194
+                        }
193 195
                     }
194 196
                 }
195 197
             }
196 198
 
197
-            if ($this->_page < $counter - 1)
198
-                $pagination.= "<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
199
-            else
200
-                $pagination.= "<li class='next disabled'><span class='disabled'>>></span></li>";
199
+            if ($this->_page < $counter - 1) {
200
+                            $pagination.= "<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
201
+            } else {
202
+                            $pagination.= "<li class='next disabled'><span class='disabled'>>></span></li>";
203
+            }
201 204
             $pagination.= "</ul>\n";
202 205
         }
203 206
 
Please login to merge, or discard this patch.