jdel / sspks

index.php

Doc Comments +3 added lines

@@ -243,6 +243,9 @@
     }
 }
 
+/**
+ * @param string $filter
+ */
 function GetDirectoryList ($directory, $filter){
     $results = array();
     $handler = opendir($directory);

Indentation +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
     $handler = opendir($directory);
     while ($file = readdir($handler)) {
         if ($file != "." && $file != ".." && preg_match("/".$filter."/", $file)) {
-              $results[] = $file;
+                $results[] = $file;
         }
     }
     closedir($handler);

Spacing +43 added lines, -43 removed lines

@@ -12,17 +12,17 @@ 
 package_update_channel = stable
 */
 
-$spkDir = "packages/";  // This has to be a directory relative to
+$spkDir = "packages/"; // This has to be a directory relative to
                         // where this  script is and served by Apache
-$synologyModels = "conf/synology_models.conf";  // File where Syno models are
+$synologyModels = "conf/synology_models.conf"; // File where Syno models are
                                                 // stored in "DS412+=cedarview"
                                                 // type format
-$excludedSynoServices = array("apache-sys","apache-web","mdns","samba","db","applenetwork","cron","nfs","firewall");
+$excludedSynoServices = array("apache-sys", "apache-web", "mdns", "samba", "db", "applenetwork", "cron", "nfs", "firewall");
 $host = $_SERVER['HTTP_HOST'].substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], "/"))."/";
 
 $siteName = "Simple SPK Server";
 
-if($_SERVER['REQUEST_METHOD'] == 'POST'){
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
     $language = trim($_POST['language']);
     $timezone = trim($_POST['timezone']);
@@ -33,18 +33,18 @@ 
     $channel = trim($_POST['package_update_channel']);
     $unique = trim($_POST['unique']);
 
-    if (!$language || !$timezone || !$arch || !$major || is_null($minor) || !$build || !$channel || !$unique || !$serial || !(preg_match("/^$unique/", $_SERVER['HTTP_USER_AGENT']) || $_SERVER['HTTP_USER_AGENT'] == "\"Mozilla/4.0 (compatible; MSIE 6.1; Windows XP) Synology\"" || $_SERVER['HTTP_USER_AGENT'] == "\"Mozilla/4.0 (compatible; MSIE 6.1; Windows XP)\"" )){
+    if (!$language || !$timezone || !$arch || !$major || is_null($minor) || !$build || !$channel || !$unique || !$serial || !(preg_match("/^$unique/", $_SERVER['HTTP_USER_AGENT']) || $_SERVER['HTTP_USER_AGENT'] == "\"Mozilla/4.0 (compatible; MSIE 6.1; Windows XP) Synology\"" || $_SERVER['HTTP_USER_AGENT'] == "\"Mozilla/4.0 (compatible; MSIE 6.1; Windows XP)\"")) {
         header('Content-type: text/html');
         header('HTTP/1.1 404 Not Found');
         header('Status: 404 Not Found');
     } else {
-        if($arch == "88f6282"){
+        if ($arch == "88f6282") {
             $arch = "88f6281";
         }
         echo stripslashes(json_encode(DisplayPackagesJSON(GetPackageList($arch, $channel, $major.".".$minor.".".$build))));
     }
 }
-elseif($_SERVER['REQUEST_METHOD'] == 'GET')
+elseif ($_SERVER['REQUEST_METHOD'] == 'GET')
 {
     $arch = trim($_GET['arch']);
     $channel = trim($_GET['channel']);
@@ -67,9 +67,9 @@ 
     echo "\t\t<div id=\"menu\">\n";
     echo "\t\t\t<ul>\n";
     echo "\t\t\t\t<li><a href=\".\">Synology Models</a></li>\n";
-    echo ($arch && !$channel)?"\t\t\t\t<li><a href=\"".$_SERVER['REQUEST_URI']."&channel=beta\">Show Beta Packages</a></li>\n":"";
-    echo $channel?"\t\t\t\t<li><a href=\"index.php?arch=".$arch."\">Hide Beta Packages</a></li>\n":"";
-    echo !$fullList?"\t\t\t\t<li><a href=\"index.php?fulllist=true\">Full Packages List</a></li>\n":"";
+    echo ($arch && !$channel) ? "\t\t\t\t<li><a href=\"".$_SERVER['REQUEST_URI']."&channel=beta\">Show Beta Packages</a></li>\n" : "";
+    echo $channel ? "\t\t\t\t<li><a href=\"index.php?arch=".$arch."\">Hide Beta Packages</a></li>\n" : "";
+    echo !$fullList ? "\t\t\t\t<li><a href=\"index.php?fulllist=true\">Full Packages List</a></li>\n" : "";
     echo "\t\t\t\t<li class=\"last\"><a href=\"http://github.com/jdel/sspks\">Host your own packages</a></li>\n";
     echo "\t\t\t</ul>\n";
     echo "\t\t</div>\n";
@@ -78,7 +78,7 @@ 
     echo "\t\t</div>\n";
     echo "\t\t<div id=\"content\">\n";
     echo "\t\t\t<ul>\n";
-    if ($arch){
+    if ($arch) {
         DisplayPackagesHTML(GetPackageList($arch, $channel, "skip"));
     } elseif ($fullList) {
         DisplayAllPackages($spkDir);
@@ -101,41 +101,41 @@ 
     header('Status: 404 Not Found');
 }
 
-function GetPackageList($arch="noarch", $beta=false, $version="") {
+function GetPackageList($arch = "noarch", $beta = false, $version = "") {
     global $host;
     global $spkDir;
     $packagesList = GetDirectoryList($spkDir, ".*\.nfo");
     $packagesAvailable = array();
-    if (!empty($packagesList)){
-        foreach($packagesList as $nfoFile){
+    if (!empty($packagesList)) {
+        foreach ($packagesList as $nfoFile) {
             $packageInfo = array();
             $spkFile = basename($nfoFile, ".nfo").".spk";
             $thumb_72 = basename($nfoFile, ".nfo")."_thumb_72.png";
             $thumb_120 = basename($nfoFile, ".nfo")."_thumb_120.png";
-            if(file_exists($spkDir.$nfoFile) && file_exists($spkDir.$spkFile)){
+            if (file_exists($spkDir.$nfoFile) && file_exists($spkDir.$spkFile)) {
                 $fileHandle = fopen($spkDir.$nfoFile, 'r');
-                while(!feof($fileHandle))
+                while (!feof($fileHandle))
                 {
                             $line = explode("=", chop(str_replace("\"", "", fgets($fileHandle))));
-                            if (trim($line[0])){ $packageInfo[$line[0]] = $line[1]; }
+                            if (trim($line[0])) { $packageInfo[$line[0]] = $line[1]; }
                 }
                 fclose($fileHandle);
                 $packageInfo['nfo'] = $spkDir.$nfoFile;
                 $packageInfo['spk'] = $spkDir.$spkFile;
-                if(file_exists($spkDir.$thumb_72)){
+                if (file_exists($spkDir.$thumb_72)) {
                     $packageInfo['thumbnail'][] = "http://".$host.$spkDir.$thumb_72;
                 } else {
                     $packageInfo['thumbnail'][] = "http://".$host.$spkDir."default_package_icon_72.png";
                 }
-                if(file_exists($spkDir.$thumb_120)){
+                if (file_exists($spkDir.$thumb_120)) {
                     $packageInfo['thumbnail'][] = "http://".$host.$spkDir.$thumb_120;
                 } else {
                     $packageInfo['thumbnail'][] = "http://".$host.$spkDir."default_package_icon_120.png";
                 }
-                foreach(GetDirectoryList($spkDir, basename($nfoFile, ".nfo").".*_screen_.*\.png") as $snapshot){
+                foreach (GetDirectoryList($spkDir, basename($nfoFile, ".nfo").".*_screen_.*\.png") as $snapshot) {
                     $packageInfo['snapshot'][] = "http://".$host.$spkDir.$snapshot;
                 }
-                if (    (empty($packagesAvailable[$packageInfo['package']])
+                if ((empty($packagesAvailable[$packageInfo['package']])
                     || version_compare($packageInfo['version'], $packagesAvailable[$packageInfo['package']]['version'], ">"))
                     && ($packageInfo['arch'] == $arch || $packageInfo['arch'] == "noarch")
                     && (($beta == "beta" && $packageInfo['beta'] == true) || empty($packageInfo['beta']))
@@ -149,12 +149,12 @@ 
     return $packagesAvailable;
 }
 
-function DisplayPackagesHTML($packagesAvailable){
+function DisplayPackagesHTML($packagesAvailable) {
     global $host;
-    foreach($packagesAvailable as $packageInfo){
+    foreach ($packagesAvailable as $packageInfo) {
         echo "\t\t\t\t<li class=\"package\">\n";
         echo "\t\t\t\t\t<div class=\"spk-icon\">\n";
-        echo "\t\t\t\t\t\t<a href=\"http://".$host.$packageInfo['spk']."\"><img src=\"".$packageInfo['thumbnail'][0]."\" alt=\"".$packageInfo["displayname"]."\" />".($packageInfo['beta']?"<ins></ins>":"")."</a>\n";
+        echo "\t\t\t\t\t\t<a href=\"http://".$host.$packageInfo['spk']."\"><img src=\"".$packageInfo['thumbnail'][0]."\" alt=\"".$packageInfo["displayname"]."\" />".($packageInfo['beta'] ? "<ins></ins>" : "")."</a>\n";
         echo "\t\t\t\t\t</div>\n";
         echo "\t\t\t\t\t<div class=\"spk-desc\">\n";
         echo "\t\t\t\t\t\t<span class=\"spk-title\">".$packageInfo["displayname"]." v".$packageInfo["version"]."</span><br />\n";
@@ -178,11 +178,11 @@ 
     }
 }
 
-function DisplayPackagesJSON($packagesAvailable){
+function DisplayPackagesJSON($packagesAvailable) {
     $packagesJSON = array();
     global $host;
     global $excludedSynoServices;
-    foreach($packagesAvailable as $packageInfo){
+    foreach ($packagesAvailable as $packageInfo) {
         $packageJSON = array(
         "package" => $packageInfo["package"],
         "version" => $packageInfo["version"],
@@ -191,23 +191,23 @@ 
         "link" => "http://".$host.$packageInfo['spk'],
         "md5" => md5_file($packageInfo['spk']),
         "size" => filesize($packageInfo['spk']),
-        "qinst" => !empty($packageInfo['qinst'])?$packageInfo['qinst']:false,                               // quick install
-        "qstart" => !empty($packageInfo['start'])?$packageInfo['start']:false,                              // quick start
-        "depsers" => !empty($packageInfo['start_dep_services'])?$packageInfo['start_dep_services']:"",      // required started packages
-        "deppkgs" => !empty($packageInfo['install_dep_services'])?trim(str_replace($excludedSynoServices, "", $packageInfo['install_dep_services'])):"",
+        "qinst" => !empty($packageInfo['qinst']) ? $packageInfo['qinst'] : false, // quick install
+        "qstart" => !empty($packageInfo['start']) ? $packageInfo['start'] : false, // quick start
+        "depsers" => !empty($packageInfo['start_dep_services']) ? $packageInfo['start_dep_services'] : "", // required started packages
+        "deppkgs" => !empty($packageInfo['install_dep_services']) ? trim(str_replace($excludedSynoServices, "", $packageInfo['install_dep_services'])) : "",
                                                                                                             // required installed packages, skips the known syno services
         "maintainer" => $packageInfo["maintainer"],
-        "changelog" => !empty($packageInfo["changelog"])?$packageInfo["changelog"]:"",
-        "beta" => !empty($packageInfo['beta'])?$packageInfo['beta']:false,                                  // beta channel
-        "thumbnail" => $packageInfo['thumbnail'],                                                           // New property for newer synos, need to check if it works with old synos
-        "icon" => $packageInfo['thumbnail'][0],                                                             // Old icon property for pre 4.2 compatibility
+        "changelog" => !empty($packageInfo["changelog"]) ? $packageInfo["changelog"] : "",
+        "beta" => !empty($packageInfo['beta']) ? $packageInfo['beta'] : false, // beta channel
+        "thumbnail" => $packageInfo['thumbnail'], // New property for newer synos, need to check if it works with old synos
+        "icon" => $packageInfo['thumbnail'][0], // Old icon property for pre 4.2 compatibility
         //"icon" => $packageInfo['package_icon'],                                                           // Get icon from INFO file
 
         //"category" => 2,                                                                                  // New property introduced, no effect on othersources packages
         //"download_count" => 6000,                                                                         // Will only display values over 1000
-        "price" => 0,                                                                                       // New property
+        "price" => 0, // New property
         //"recent_download_count" => 1222,                                                                  // Not sure what this does
-        "type" => 0,                                                                                        // New property introduced, no effect on othersources packages
+        "type" => 0, // New property introduced, no effect on othersources packages
         "snapshot" => $packageInfo['snapshot']                                                              // Adds multiple screenshots to package view
         );
         $packagesJSON[] = $packageJSON;
@@ -219,31 +219,31 @@ 
         global $spkDir;
         global $host;
         $packagesList = GetDirectoryList($spkDir, ".*\.spk");
-        foreach($packagesList as $spkFile){
+        foreach ($packagesList as $spkFile) {
                 echo "\t\t\t\t<li><a href=\"http://".$host.$spkDir.$spkFile."\">".$spkFile."</a></li>\n";
         }
 }
 
 function DisplaySynoModels($synologyModelsFile) {
-    if(file_exists($synologyModelsFile)){
+    if (file_exists($synologyModelsFile)) {
         $synologyModels = array();
         $fileHandle = fopen($synologyModelsFile, 'r');
-        while(!feof($fileHandle))
+        while (!feof($fileHandle))
         {
             $line = explode("=", chop(str_replace("\"", "", fgets($fileHandle))));
-            if ($line[0]){ $synologyModels[$line[0]] = $line[1]; }
+            if ($line[0]) { $synologyModels[$line[0]] = $line[1]; }
         }
         fclose($fileHandle);
         ksort($synologyModels);
-        foreach ($synologyModels as $synoName => $synoArch){
+        foreach ($synologyModels as $synoName => $synoArch) {
             echo "\t\t\t\t<li class=\"syno-model\"><a href=\"?arch=".$synoArch."\">".$synoName."</a></li>\n";
         }
-    } else  {
+    } else {
         echo "\t\t\t\t<li>Couldn't find Synology models</li>";
     }
 }
 
-function GetDirectoryList ($directory, $filter){
+function GetDirectoryList($directory, $filter) {
     $results = array();
     $handler = opendir($directory);
     while ($file = readdir($handler)) {

Braces +2 added lines, -4 removed lines

@@ -43,8 +43,7 @@ 
         }
         echo stripslashes(json_encode(DisplayPackagesJSON(GetPackageList($arch, $channel, $major.".".$minor.".".$build))));
     }
-}
-elseif($_SERVER['REQUEST_METHOD'] == 'GET')
+} elseif($_SERVER['REQUEST_METHOD'] == 'GET')
 {
     $arch = trim($_GET['arch']);
     $channel = trim($_GET['channel']);
@@ -93,8 +92,7 @@ 
     echo "\t\t</div>\n";
     echo "\t</body>\n";
     echo "</html>";
-}
-else
+} else
 {
     header('Content-type: text/html');
     header('HTTP/1.1 404 Not Found');