Completed
Branch master (15a86c)
by Michael
06:07
created
index.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -165,18 +165,18 @@
 block discarded – undo
165 165
 
166 166
 $tags = empty($list)?"":array($article_prefix."art_title", $article_prefix."blog_id", $article_prefix."art_time");
167 167
 switch($query_type){
168
-case "category":
169
-	$articles_obj =& $article_handler->getByCategory($criteria, $tags);
170
-	$count_article = $article_handler->getCountByCategory($criteria);
171
-	break;
172
-case "bookmark":
173
-	$articles_obj =& $article_handler->getByBookmark($criteria, $tags);
174
-	$count_article = $article_handler->getCountByBookmark($criteria);
175
-	break;
176
-default:
177
-	$articles_obj =& $article_handler->getAll($criteria, $tags);
178
-	$count_article = $article_handler->getCount($criteria);
179
-	break;
168
+	case "category":
169
+		$articles_obj =& $article_handler->getByCategory($criteria, $tags);
170
+		$count_article = $article_handler->getCountByCategory($criteria);
171
+		break;
172
+	case "bookmark":
173
+		$articles_obj =& $article_handler->getByBookmark($criteria, $tags);
174
+		$count_article = $article_handler->getCountByBookmark($criteria);
175
+		break;
176
+	default:
177
+		$articles_obj =& $article_handler->getAll($criteria, $tags);
178
+		$count_article = $article_handler->getCount($criteria);
179
+		break;
180 180
 }
181 181
 
182 182
 if(!empty($blog_data)){
Please login to merge, or discard this patch.
action.blog.php 2 patches
Indentation   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 $blog_id = is_array($blog_id)?array_map("intval", $blog_id):intval($blog_id);
33 33
 
34 34
 if(empty($xoopsModuleConfig["newblog_submit"]) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())){
35
-        redirect_header("index.php", 2, _NOPERM);
35
+		redirect_header("index.php", 2, _NOPERM);
36 36
 }
37 37
 
38 38
 if($op=="save" && !empty($_POST["fetch"])){
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 }
41 41
 
42 42
 if($op=="save" && !$GLOBALS['xoopsSecurity']->check()){
43
-    redirect_header("javascript:history.go(-1);", 1, planet_constant("MD_INVALID").": security check failed");
44
-    exit();
43
+	redirect_header("javascript:history.go(-1);", 1, planet_constant("MD_INVALID").": security check failed");
44
+	exit();
45 45
 }
46 46
 include XOOPS_ROOT_PATH."/header.php";
47 47
 include XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
@@ -53,19 +53,19 @@  discard block
 block discarded – undo
53 53
 	/* save a single blog */
54 54
 	case "save":
55 55
 		
56
-        if ($blog_id) {
57
-            $blog_obj =& $blog_handler->get($blog_id);
56
+		if ($blog_id) {
57
+			$blog_obj =& $blog_handler->get($blog_id);
58 58
 			if($xoopsUser->isAdmin()){
59
-        		$blog_obj->setVar('blog_status', @$_POST["blog_status"]);
59
+				$blog_obj->setVar('blog_status', @$_POST["blog_status"]);
60 60
 			}        	
61
-        } else {
62
-	        if($blog_exists = $blog_handler->getCount(new Criteria("blog_feed", $myts->addSlashes( trim($_POST['blog_feed']) )))){
63
-		        redirect_header("index.php", 2, planet_constant("MD_BLOGEXISTS"));
64
-		        exit();
65
-	        }
61
+		} else {
62
+			if($blog_exists = $blog_handler->getCount(new Criteria("blog_feed", $myts->addSlashes( trim($_POST['blog_feed']) )))){
63
+				redirect_header("index.php", 2, planet_constant("MD_BLOGEXISTS"));
64
+				exit();
65
+			}
66 66
 	        
67
-            $blog_obj =& $blog_handler->create();
68
-        	$blog_obj->setVar('blog_submitter', is_object($xoopsUser)?$xoopsUser->getVar("uid"):planet_getIP(true));
67
+			$blog_obj =& $blog_handler->create();
68
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser)?$xoopsUser->getVar("uid"):planet_getIP(true));
69 69
         	
70 70
 			switch($xoopsModuleConfig["newblog_submit"]){
71 71
 			case 2:
@@ -89,65 +89,65 @@  discard block
 block discarded – undo
89 89
 				break;
90 90
 			}
91 91
 			
92
-        	$blog_obj->setVar('blog_status', $status);
93
-        }
92
+			$blog_obj->setVar('blog_status', $status);
93
+		}
94 94
 
95
-        $blog_obj->setVar('blog_title', $_POST['blog_title']);
96
-        $blog_obj->setVar('blog_desc', $_POST['blog_desc']);
97
-        $blog_obj->setVar('blog_image', $_POST['blog_image']);
98
-        $blog_obj->setVar('blog_feed', $_POST['blog_feed']);
99
-        $blog_obj->setVar('blog_link', $_POST['blog_link']);
100
-        $blog_obj->setVar('blog_language', $_POST['blog_language']);
101
-        $blog_obj->setVar('blog_charset', $_POST['blog_charset']);
102
-        $blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
103
-        if($blog_obj->isNew()){
104
-        	$blog_obj->setVar('blog_submitter', is_object($xoopsUser)?$xoopsUser->getVar("uid"):planet_getIP(true));
105
-    	}
95
+		$blog_obj->setVar('blog_title', $_POST['blog_title']);
96
+		$blog_obj->setVar('blog_desc', $_POST['blog_desc']);
97
+		$blog_obj->setVar('blog_image', $_POST['blog_image']);
98
+		$blog_obj->setVar('blog_feed', $_POST['blog_feed']);
99
+		$blog_obj->setVar('blog_link', $_POST['blog_link']);
100
+		$blog_obj->setVar('blog_language', $_POST['blog_language']);
101
+		$blog_obj->setVar('blog_charset', $_POST['blog_charset']);
102
+		$blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
103
+		if($blog_obj->isNew()){
104
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser)?$xoopsUser->getVar("uid"):planet_getIP(true));
105
+		}
106 106
 
107
-        if (!$blog_handler->insert($blog_obj)) {
108
-        }elseif(!empty($_POST["categories"])){
109
-	    	$blog_id = $blog_obj->getVar("blog_id");
107
+		if (!$blog_handler->insert($blog_obj)) {
108
+		}elseif(!empty($_POST["categories"])){
109
+			$blog_id = $blog_obj->getVar("blog_id");
110 110
 			if(in_array(0, $_POST["categories"])) $_POST["categories"] = array();
111 111
 			$blog_handler->setCategories($blog_id, $_POST["categories"]);
112
-        }
113
-        $message = planet_constant("MD_DBUPDATED");
114
-        redirect_header("index.php".URL_DELIMITER."b".$blog_id, 2, $message);
115
-        exit();	
112
+		}
113
+		$message = planet_constant("MD_DBUPDATED");
114
+		redirect_header("index.php".URL_DELIMITER."b".$blog_id, 2, $message);
115
+		exit();	
116 116
         
117
-    /* edit a single blog */
117
+	/* edit a single blog */
118 118
 	case "edit":
119 119
 	default:
120
-        if(!empty($_POST["fetch"])){
121
-        	$blog_obj =& $blog_handler->fetch($_POST["blog_feed"]);
122
-        	$blog_obj->setVar("blog_id", $blog_id);	        
123
-        }else{
124
-        	$blog_obj =& $blog_handler->get($blog_id);
125
-        }
126
-	    $categories = isset($_POST["categories"])?$_POST["categories"]:array();	    
120
+		if(!empty($_POST["fetch"])){
121
+			$blog_obj =& $blog_handler->fetch($_POST["blog_feed"]);
122
+			$blog_obj->setVar("blog_id", $blog_id);	        
123
+		}else{
124
+			$blog_obj =& $blog_handler->get($blog_id);
125
+		}
126
+		$categories = isset($_POST["categories"])?$_POST["categories"]:array();	    
127 127
 		if(in_array("-1", $categories)) $categories = array();
128
-        if(empty($categories) && $blog_id>0){
129
-	        $crit = new Criteria("bc.blog_id", $blog_id);
130
-	    	$categories = array_keys($category_handler->getByBlog($crit));
131
-        }
132
-        if(empty($categories)) $categories = array(0=>_NONE);
128
+		if(empty($categories) && $blog_id>0){
129
+			$crit = new Criteria("bc.blog_id", $blog_id);
130
+			$categories = array_keys($category_handler->getByBlog($crit));
131
+		}
132
+		if(empty($categories)) $categories = array(0=>_NONE);
133 133
        
134
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . "</legend>";
135
-        echo"<br />";
136
-        if(empty($blog_id) && $blog_obj->getVar("blog_feed")){
137
-	        $criteria = new Criteria("blog_feed", $blog_obj->getVar("blog_feed"));
138
-	        $blogs_obj =& $blog_handler->getList($criteria);
139
-	        if(count($blogs_obj)>0){
140
-		        echo "<div class=\"errorMsg\">".planet_constant("MD_BLOGEXISTS");
141
-		        foreach(array_keys($blogs_obj) as $bid){
142
-			        echo "<br /><a href=\"".XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php".URL_DELIMITER."b".$bid."\" target=\"_blank\">".$blogs_obj[$bid]."</a>";
143
-		        }
144
-		        echo "</div>";
145
-	        	unset($blogs_obj, $criteria);
146
-	        }
147
-        }
148
-        include XOOPS_ROOT_PATH."/modules/".$GLOBALS["moddirname"]."/include/form.blog.php";
149
-        echo "</fieldset>";
150
-        break;	
134
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . "</legend>";
135
+		echo"<br />";
136
+		if(empty($blog_id) && $blog_obj->getVar("blog_feed")){
137
+			$criteria = new Criteria("blog_feed", $blog_obj->getVar("blog_feed"));
138
+			$blogs_obj =& $blog_handler->getList($criteria);
139
+			if(count($blogs_obj)>0){
140
+				echo "<div class=\"errorMsg\">".planet_constant("MD_BLOGEXISTS");
141
+				foreach(array_keys($blogs_obj) as $bid){
142
+					echo "<br /><a href=\"".XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php".URL_DELIMITER."b".$bid."\" target=\"_blank\">".$blogs_obj[$bid]."</a>";
143
+				}
144
+				echo "</div>";
145
+				unset($blogs_obj, $criteria);
146
+			}
147
+		}
148
+		include XOOPS_ROOT_PATH."/modules/".$GLOBALS["moddirname"]."/include/form.blog.php";
149
+		echo "</fieldset>";
150
+		break;	
151 151
 }
152 152
 
153 153
 include XOOPS_ROOT_PATH."/footer.php";
Please login to merge, or discard this patch.
Switch Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -68,25 +68,25 @@
 block discarded – undo
68 68
         	$blog_obj->setVar('blog_submitter', is_object($xoopsUser)?$xoopsUser->getVar("uid"):planet_getIP(true));
69 69
         	
70 70
 			switch($xoopsModuleConfig["newblog_submit"]){
71
-			case 2:
72
-				if(!is_object($xoopsUser)){
73
-					$status = 0;
74
-				}else{
71
+				case 2:
72
+					if(!is_object($xoopsUser)){
73
+						$status = 0;
74
+					}else{
75
+						$status = 1;
76
+					}
77
+					break;
78
+				case 0:
79
+				case 3:
75 80
 					$status = 1;
76
-				}
77
-				break;
78
-			case 0:
79
-			case 3:
80
-				$status = 1;
81
-				break;
82
-			case 1:
83
-			default:
84
-				if(!is_object($xoopsUser) || !$xoopsUser->isAdmin()){
85
-					$status = 0;
86
-				}else{
87
-					$status = 1;
88
-				}
89
-				break;
81
+					break;
82
+				case 1:
83
+				default:
84
+					if(!is_object($xoopsUser) || !$xoopsUser->isAdmin()){
85
+						$status = 0;
86
+					}else{
87
+						$status = 1;
88
+					}
89
+					break;
90 90
 			}
91 91
 			
92 92
         	$blog_obj->setVar('blog_status', $status);
Please login to merge, or discard this patch.
trackback.php 1 patch
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -80,17 +80,17 @@
 block discarded – undo
80 80
 	$comment->setVar('com_rootid', $com_rootid);
81 81
 	$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
82 82
 	switch ($tb_status) {
83
-	case 2:
84
-		$comment->setVar('com_status', 2);
85
-		$call_approvefunc = true;
86
-		$call_updatefunc = true;
87
-		$notify_event = 'comment';
88
-		break;
89
-	case 1:
90
-	default:
91
-		$comment->setVar('com_status', 1);
92
-		$notify_event = 'comment_submit';
93
-		break;
83
+		case 2:
84
+			$comment->setVar('com_status', 2);
85
+			$call_approvefunc = true;
86
+			$call_updatefunc = true;
87
+			$notify_event = 'comment';
88
+			break;
89
+		case 1:
90
+		default:
91
+			$comment->setVar('com_status', 1);
92
+			$notify_event = 'comment_submit';
93
+			break;
94 94
 	}
95 95
 	$comment->setVar('com_uid', 0);
96 96
 	$com_title = xoops_trim($com_title);
Please login to merge, or discard this patch.
xoops_version.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,8 +57,8 @@
 block discarded – undo
57 57
 $modversion['min_xoops']           = "2.5.6";
58 58
 $modversion['min_admin']           = '1.1';
59 59
 $modversion['min_db']              = array(
60
-    'mysql'  => '5.0.7',
61
-    'mysqli' => '5.0.7'
60
+	'mysql'  => '5.0.7',
61
+	'mysqli' => '5.0.7'
62 62
 );
63 63
 
64 64
 
Please login to merge, or discard this patch.
view.blogs.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -132,18 +132,18 @@
 block discarded – undo
132 132
 
133 133
 $tags = empty($list) ? "" : array($blog_prefix."blog_title", $blog_prefix."blog_time");
134 134
 switch($query_type){
135
-case "category":
136
-	$blogs_obj =& $blog_handler->getByCategory($criteria, $tags);
137
-	$count_blog = $blog_handler->getCountByCategory($criteria);
138
-	break;
139
-case "bookmark":
140
-	$blogs_obj =& $blog_handler->getByBookmark($criteria, $tags);
141
-	$count_blog = $blog_handler->getCountByBookmark($criteria);
142
-	break;
143
-default:
144
-	$blogs_obj =& $blog_handler->getAll($criteria, $tags);
145
-	$count_blog = $blog_handler->getCount($criteria);
146
-	break;
135
+	case "category":
136
+		$blogs_obj =& $blog_handler->getByCategory($criteria, $tags);
137
+		$count_blog = $blog_handler->getCountByCategory($criteria);
138
+		break;
139
+	case "bookmark":
140
+		$blogs_obj =& $blog_handler->getByBookmark($criteria, $tags);
141
+		$count_blog = $blog_handler->getCountByBookmark($criteria);
142
+		break;
143
+	default:
144
+		$blogs_obj =& $blog_handler->getAll($criteria, $tags);
145
+		$count_blog = $blog_handler->getCount($criteria);
146
+		break;
147 147
 }
148 148
 
149 149
 /* Objects to array */
Please login to merge, or discard this patch.
print.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -75,14 +75,14 @@  discard block
 block discarded – undo
75 75
 
76 76
 	header('Content-Type: text/html; charset='._CHARSET); 
77 77
 	echo "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n";
78
-    echo "<html>\n<head>\n";
79
-    echo "<title>" . $xoopsConfig['sitename'] . "</title>\n";
80
-    echo "<meta http-equiv='Content-Type' content='text/html; charset=" . _CHARSET . "' />\n";
81
-    echo "<meta name='AUTHOR' content='" . $myts->htmlspecialchars($xoopsConfig['sitename']) . "' />\n";
82
-    echo "<meta name='COPYRIGHT' content='Copyright (c) ".date('Y')." by " . $xoopsConfig['sitename'] . "' />\n";
83
-    echo "<meta name='DESCRIPTION' content='" . $myts->htmlspecialchars($xoopsConfig['slogan']) . "' />\n";
84
-    echo "<meta name='GENERATOR' content='" . XOOPS_VERSION . "' />\n";
85
-    echo "<style type='text/css'>
78
+	echo "<html>\n<head>\n";
79
+	echo "<title>" . $xoopsConfig['sitename'] . "</title>\n";
80
+	echo "<meta http-equiv='Content-Type' content='text/html; charset=" . _CHARSET . "' />\n";
81
+	echo "<meta name='AUTHOR' content='" . $myts->htmlspecialchars($xoopsConfig['sitename']) . "' />\n";
82
+	echo "<meta name='COPYRIGHT' content='Copyright (c) ".date('Y')." by " . $xoopsConfig['sitename'] . "' />\n";
83
+	echo "<meta name='DESCRIPTION' content='" . $myts->htmlspecialchars($xoopsConfig['slogan']) . "' />\n";
84
+	echo "<meta name='GENERATOR' content='" . XOOPS_VERSION . "' />\n";
85
+	echo "<style type='text/css'>
86 86
 			body {
87 87
 				color:#000000;
88 88
 				background-color:#EFEFEF;
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 			}
98 98
     		</style>\n";
99 99
    	echo "</head>\n";
100
-    echo "<body style='background-color:#ffffff; color:#000000; font-family: Arial' onload='window.print()'>\n".
100
+	echo "<body style='background-color:#ffffff; color:#000000; font-family: Arial' onload='window.print()'>\n".
101 101
  		 "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n".
102 102
 			"<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n".
103 103
 			"<img src='" . $print_data["image"] . "' border='0' alt='".$print_data["module"]."' />\n".
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 			"<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n".
118 118
 			"<div>".$print_data["module"]."</div>\n".
119 119
 			"<div>URL: ".$print_data["url"]."</div>\n".
120
-	    "</div>\n".
121
-        "</body>\n</html>\n";
120
+		"</div>\n".
121
+		"</body>\n</html>\n";
122 122
 exit();        
123 123
 ?>
124 124
\ No newline at end of file
Please login to merge, or discard this patch.
admin/index.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
 	$indexAdmin = new ModuleAdmin();
28 28
 
29
-    echo $indexAdmin->addNavigation('index.php');
30
-    echo $indexAdmin->renderIndex();
29
+	echo $indexAdmin->addNavigation('index.php');
30
+	echo $indexAdmin->renderIndex();
31 31
 
32 32
 include "admin_footer.php";
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
admin/menu.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 
43 43
 
44 44
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
45
-    $fileinc = $pathLanguage . '/language/english/main.php';
45
+	$fileinc = $pathLanguage . '/language/english/main.php';
46 46
 }
47 47
 
48 48
 include_once $fileinc;
Please login to merge, or discard this patch.
admin/admin_footer.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@
 block discarded – undo
19 19
  */
20 20
 
21 21
 echo "<div class='adminfooter'>\n"
22
-    ."  <div style='text-align: center;'>\n"
23
-    ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
24
-    ."  </div>\n"
25
-    ."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
26
-    ."</div>";
22
+	."  <div style='text-align: center;'>\n"
23
+	."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
24
+	."  </div>\n"
25
+	."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
26
+	."</div>";
27 27
 
28 28
 xoops_cp_footer();
29 29
\ No newline at end of file
Please login to merge, or discard this patch.