OpencachingDeutschland / oc-server3

htdocs/lib/clicompatbase.inc.php

Doc Comments +31 added lines

@@ -76,6 +76,12 @@ 
 // prepare EMail-From
 $emailheaders = 'From: "' . $emailaddr . '" <' . $emailaddr . '>';
 
+/**
+ * @param string $module
+ * @param integer $eventid
+ * @param integer $objectid2
+ * @param string $logtext
+ */
 function logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
 {
     sql(
@@ -148,6 +154,9 @@ 
     return $start;
 }
 
+/**
+ * @return string
+ */
 function escape_javascript($text)
 {
     return str_replace('\'', '\\\'', str_replace('"', '&quot;', $text));
@@ -159,6 +168,9 @@ 
     sql_error();
 }
 
+/**
+ * @param string $sql
+ */
 function sqlValue($sql, $default)
 {
     $rs = sql($sql);
@@ -187,11 +199,21 @@ 
     }
 }
 
+/**
+ * @param string $name
+ * @param string $default
+ *
+ * @return string
+ */
 function getSysConfig($name, $default)
 {
     return sqlValue('SELECT `value` FROM `sysconfig` WHERE `name`=\'' . sql_escape($name) . '\'', $default);
 }
 
+/**
+ * @param string $name
+ * @param string $value
+ */
 function setSysConfig($name, $value)
 {
     if (sqlValue('SELECT COUNT(*) FROM sysconfig WHERE name=\'' . sql_escape($name) . '\'', 0) == 1) {
@@ -516,6 +538,9 @@ 
     die('sql_error');
 }
 
+/**
+ * @param string $warnmessage
+ */
 function sql_warn($warnmessage)
 {
     global $sql_errormail;
@@ -549,6 +574,9 @@ 
     return mysql_fetch_row($rs);
 }
 
+/**
+ * @param resource $rs
+ */
 function sql_fetch_column($rs)
 {
     $col = [];
@@ -758,6 +786,9 @@ 
     ];
 }
 
+/**
+ * @param string $filename
+ */
 function fetch_email_template($filename, $language, $domain)
 {
     global $opt, $rootpath;

Spacing +36 added lines, -36 removed lines

@@ -20,7 +20,7 @@ 
  * $dblink
  ****************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 global $interface_output, $dblink_slave;
 if (!isset($interface_output)) {
@@ -49,9 +49,9 @@ 
 define('regex_statpic_text', '^[a-zA-Z0-9\.\-_ @äüöÄÜÖß=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°]{0,29}$');
 
 //load default webserver-settings and common includes
-require_once $opt['rootpath'] . 'lib/consts.inc.php';
-require_once $opt['rootpath'] . 'lib/settings.inc.php';
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
+require_once $opt['rootpath'].'lib/consts.inc.php';
+require_once $opt['rootpath'].'lib/settings.inc.php';
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
 
 // check for banned UAs
 $useragent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
@@ -74,7 +74,7 @@ 
 }
 
 // prepare EMail-From
-$emailheaders = 'From: "' . $emailaddr . '" <' . $emailaddr . '>';
+$emailheaders = 'From: "'.$emailaddr.'" <'.$emailaddr.'>';
 
 function logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
 {
@@ -113,7 +113,7 @@ 
 
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
-        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false) {
                 if ($nNextSep > $nThisPos) {
@@ -189,12 +189,12 @@ 
 
 function getSysConfig($name, $default)
 {
-    return sqlValue('SELECT `value` FROM `sysconfig` WHERE `name`=\'' . sql_escape($name) . '\'', $default);
+    return sqlValue('SELECT `value` FROM `sysconfig` WHERE `name`=\''.sql_escape($name).'\'', $default);
 }
 
 function setSysConfig($name, $value)
 {
-    if (sqlValue('SELECT COUNT(*) FROM sysconfig WHERE name=\'' . sql_escape($name) . '\'', 0) == 1) {
+    if (sqlValue('SELECT COUNT(*) FROM sysconfig WHERE name=\''.sql_escape($name).'\'', 0) == 1) {
         sql(
             "UPDATE `sysconfig` SET `value`='&1' WHERE `name`='&2' LIMIT 1",
             $value,
@@ -294,10 +294,10 @@ 
         // muss dieses & ersetzt werden, oder ist es escaped?
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) && (mb_substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 1) {
-            $nextarg ++;
+            $nextarg++;
         } else {
             $nextchar = mb_substr($sql, $nextarg + 1, 1);
             if (is_numeric($nextchar)) {
@@ -308,7 +308,7 @@ 
                 while (mb_ereg_match('^[0-9]{1}', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -349,13 +349,13 @@ 
                         // Anführungszeichen weg machen und NULL einsetzen
                         $filtered_sql = mb_substr($filtered_sql, 0, mb_strlen($filtered_sql) - 1);
                         $filtered_sql .= 'NULL';
-                        $sqlpos ++;
+                        $sqlpos++;
                     } else {
                         $filtered_sql .= 'NULL';
                     }
                 }
 
-                $sqlpos ++;
+                $sqlpos++;
             } else {
                 $arglength = 0;
                 $arg = '';
@@ -364,7 +364,7 @@ 
                 while (mb_ereg_match('^[a-zA-Z0-9]{1}', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -396,12 +396,12 @@ 
                     $nextarg - $escapesCount - 1,
                     1
                 ) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 0) {
             // \& ersetzen durch &
-            $filtered_sql = mb_substr($filtered_sql, 0, $nextarg) . '&' . mb_substr($filtered_sql, $nextarg + 2);
-            $nextarg --;
+            $filtered_sql = mb_substr($filtered_sql, 0, $nextarg).'&'.mb_substr($filtered_sql, $nextarg + 2);
+            $nextarg--;
         }
 
         $nextarg = mb_strpos($filtered_sql, '\&', $nextarg + 2);
@@ -418,14 +418,14 @@ 
     */
 
     if (isset($sql_debug) && ($sql_debug == true)) {
-        require_once $opt['rootpath'] . 'lib/sqldebugger.inc.php';
+        require_once $opt['rootpath'].'lib/sqldebugger.inc.php';
         $result = sqldbg_execute($filtered_sql, $bSlave);
         if ($result === false) {
             sql_error();
         }
     } else {
         // Zeitmessung für die Ausführung
-        require_once $opt['rootpath'] . 'lib/bench.inc.php';
+        require_once $opt['rootpath'].'lib/bench.inc.php';
         $cSqlExecution = new Cbench;
         $cSqlExecution->start();
 
@@ -437,8 +437,8 @@ 
         $cSqlExecution->stop();
 
         if ($sql_warntime > 0 && $cSqlExecution->diff() > $sql_warntime) {
-            $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n" . $_SERVER['HTTP_USER_AGENT'] : "";
-            sql_warn("execution took " . $cSqlExecution->diff() . " seconds" . $ua);
+            $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n".$_SERVER['HTTP_USER_AGENT'] : "";
+            sql_warn("execution took ".$cSqlExecution->diff()." seconds".$ua);
         }
     }
 
@@ -473,7 +473,7 @@ 
     global $db_error;
 
     $db_error += 1;
-    $msql_error = mysql_errno() . ": " . mysql_error();
+    $msql_error = mysql_errno().": ".mysql_error();
     if ($db_error > 1) {
         $msql_error .= "\n(** error recursion **)";
     }
@@ -484,13 +484,13 @@ 
         $email_content .= "\n--------------------\n";
         $email_content .= print_r(debug_backtrace(), true);
         if (admin_errormail($sql_errormail, 'sql_error', $email_content, $emailheaders)) {
-            mb_send_mail($sql_errormail, 'sql_error: ' . $absolute_server_URI, $email_content, $emailheaders);
+            mb_send_mail($sql_errormail, 'sql_error: '.$absolute_server_URI, $email_content, $emailheaders);
         }
     }
 
     if ($interface_output == 'html') {
         // display errorpage
-        $errmsg = $dberrormsg . ($debug_page ? "<br />" . $msql_error : "");
+        $errmsg = $dberrormsg.($debug_page ? "<br />".$msql_error : "");
         if ($db_error <= 1) {
             tpl_errorMsg('sql_error', $errmsg);
         } else {
@@ -504,12 +504,12 @@ 
         exit;
     } elseif ($interface_output == 'plain') {
         echo "\n";
-        echo 'sql_error' . "\n";
+        echo 'sql_error'."\n";
         if ($debug_page) {
-            echo $msql_error . "\n";
+            echo $msql_error."\n";
         }
-        echo '---------' . "\n";
-        echo print_r(debug_backtrace(), true) . "\n";
+        echo '---------'."\n";
+        echo print_r(debug_backtrace(), true)."\n";
         exit;
     }
 
@@ -527,7 +527,7 @@ 
     $email_content .= print_r(debug_backtrace(), true);
 
     if (admin_errormail($sql_errormail, 'sql_warn', $email_content, $emailheaders)) {
-        $sendMail = @mb_send_mail($sql_errormail, 'sql_warn: ' . $absolute_server_URI, $email_content, $emailheaders);
+        $sendMail = @mb_send_mail($sql_errormail, 'sql_warn: '.$absolute_server_URI, $email_content, $emailheaders);
         if ($sendMail === false) {
             throw new \RuntimeException('the E-Mail can not be send.');
         }
@@ -630,7 +630,7 @@ 
     }
 
     if ($dblink != false) {
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $dblink) . "'", $dblink);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $dblink)."'", $dblink);
 
         //database connection established ... set the used database
         if (@mysql_select_db($dbname, $dblink) == false) {
@@ -666,7 +666,7 @@ 
     $nMaxTimeDiff = $opt['db']['slave']['max_behind'];
     if ($usr !== false) {
         $nMaxTimeDiff = sqlValue(
-            "SELECT TIMESTAMP(NOW())-TIMESTAMP(`datExclude`) FROM `sys_repl_exclude` WHERE `user_id`='" . ($usr['userid'] + 0) . "'",
+            "SELECT TIMESTAMP(NOW())-TIMESTAMP(`datExclude`) FROM `sys_repl_exclude` WHERE `user_id`='".($usr['userid'] + 0)."'",
             $opt['db']['slave']['max_behind']
         );
         if ($nMaxTimeDiff > $opt['db']['slave']['max_behind']) {
@@ -675,7 +675,7 @@ 
     }
 
     $id = sqlValue(
-        "SELECT `id`, `weight`*RAND() AS `w` FROM `sys_repl_slaves` WHERE `active`=1 AND `online`=1 AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'" . ($nMaxTimeDiff + 0) . "') ORDER BY `w` DESC LIMIT 1",
+        "SELECT `id`, `weight`*RAND() AS `w` FROM `sys_repl_slaves` WHERE `active`=1 AND `online`=1 AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'".($nMaxTimeDiff + 0)."') ORDER BY `w` DESC LIMIT 1",
         - 1
     );
 
@@ -747,9 +747,9 @@ 
             $protocol = 'http';
         }
 
-        $site_url = $protocol . strstr($opt['domain'][$domain]['url'], '://');
+        $site_url = $protocol.strstr($opt['domain'][$domain]['url'], '://');
         if (isset($opt['domain'][$domain]['shortlink_domain']) && $opt['domain'][$domain]['shortlink_domain']) {
-            $shortlink_url = $protocol . '://' . $opt['domain'][$domain]['shortlink_domain'] . '/';
+            $shortlink_url = $protocol.'://'.$opt['domain'][$domain]['shortlink_domain'].'/';
         } else {
             $shortlink_url = false;
         }
@@ -769,10 +769,10 @@ 
         $language = $opt['template']['default']['locale'];
     }
     $language = strtolower($language);
-    if (!file_exists($rootpath . '/lang/de/ocstyle/email/' . $language . '/' . $filename . '.email')) {
+    if (!file_exists($rootpath.'/lang/de/ocstyle/email/'.$language.'/'.$filename.'.email')) {
         $language = 'en';
     }
-    $mailtext = read_file($rootpath . '/lang/de/ocstyle/email/' . $language . '/' . $filename . '.email');
+    $mailtext = read_file($rootpath.'/lang/de/ocstyle/email/'.$language.'/'.$filename.'.email');
 
     $urls = get_site_urls($domain);
     $mailtext = mb_ereg_replace("{site_url}", $urls['site_url'], $mailtext);

htdocs/lib/common.inc.php

Doc Comments +22 added lines

@@ -323,6 +323,9 @@ 
 //set no_eval true to prevent this contents from php-parsing.
 //Important when replacing something that the user has posted
 //in HTML code and could contain \<\? php-Code \?\>
+/**
+ * @param string $name
+ */
 function tpl_set_var($name, $value, $no_eval = true)
 {
     global $vars, $no_eval_vars;
@@ -543,6 +546,9 @@ 
 }
 
 //redirect to another site to display, i.e. to view a cache after logging
+/**
+ * @param string $page
+ */
 function tpl_redirect($page)
 {
     global $absolute_server_URI;
@@ -562,6 +568,9 @@ 
 //process the template replacements
 //no_eval_replace - if true, variables will be replaced that are
 //                  marked as "no_eval"
+/**
+ * @param string $str
+ */
 function tpl_do_replace($str)
 {
     global $vars, $no_eval_vars;
@@ -589,6 +598,10 @@ 
     return $str;
 }
 
+/**
+ * @param string $tplnameError
+ * @param string $msg
+ */
 function tpl_errorMsg($tplnameError, $msg)
 {
     global $tplname;
@@ -617,6 +630,9 @@ 
     textdomain('messages');
 }
 
+/**
+ * @param string $sCode
+ */
 function tpl_do_translation($sCode)
 {
     global $opt, $style, $tplname;
@@ -645,6 +661,9 @@ 
     return $sResultCode;
 }
 
+/**
+ * @param string $sCode
+ */
 function gettext_do_html($sCode)
 {
     $sResultCode = '';
@@ -674,6 +693,9 @@ 
     return $sResultCode;
 }
 
+/**
+ * @return string
+ */
 function t($str)
 {
     global $translate;

Spacing +44 added lines, -44 removed lines

@@ -35,19 +35,19 @@ 
 if (!isset($rootpath)) {
     $rootpath = './';
 }
-require_once $rootpath . 'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib/clicompatbase.inc.php';
 
 // enforce http or https?
 if (isset($opt['gui']) && $opt['gui'] == GUI_HTML) {
     if ($opt['page']['https']['mode'] == HTTPS_DISABLED) {
         if ($opt['page']['https']['active']) {
-            header('Location: http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+            header('Location: http://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
         }
         $opt['page']['force_https_login'] = false;
     } else {
         if ($opt['page']['https']['mode'] == HTTPS_ENFORCED) {
             if (!$opt['page']['https']['active']) {
-                header('Location: https://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+                header('Location: https://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
             }
             $opt['page']['force_https_login'] = true;
         }
@@ -58,12 +58,12 @@ 
 load_domain_settings();
 
 // load HTML specific includes
-require_once $rootpath . 'lib/cookie.class.php';
+require_once $rootpath.'lib/cookie.class.php';
 
 //site in service?
 if ($site_in_service == false) {
     header('Content-type: text/html; charset=utf-8');
-    $page_content = read_file($rootpath . 'html/outofservice.tpl.php');
+    $page_content = read_file($rootpath.'html/outofservice.tpl.php');
     die($page_content);
 }
 
@@ -84,7 +84,7 @@ 
 }
 
 //are there files for this language?
-if (!file_exists($rootpath . 'lang/' . $lang . '/')) {
+if (!file_exists($rootpath.'lang/'.$lang.'/')) {
     die('Critical Error: The specified language does not exist!');
 }
 
@@ -97,22 +97,22 @@ 
 }
 
 //does the style exist?
-if (!file_exists($rootpath . 'lang/' . $lang . '/' . $style . '/')) {
+if (!file_exists($rootpath.'lang/'.$lang.'/'.$style.'/')) {
     $style = 'ocstyle';
 }
 
-if (!file_exists($rootpath . 'lang/' . $lang . '/' . $style . '/')) {
+if (!file_exists($rootpath.'lang/'.$lang.'/'.$style.'/')) {
     die('Critical Error: The specified style does not exist!');
 }
 
 //set up the language path
 if (!isset($langpath)) {
-    $langpath = $rootpath . 'lang/' . $lang;
+    $langpath = $rootpath.'lang/'.$lang;
 }
 
 //set up the style path
 if (!isset($stylepath)) {
-    $stylepath = $langpath . '/' . $style;
+    $stylepath = $langpath.'/'.$style;
 }
 
 //load gettext translation
@@ -121,14 +121,14 @@ 
 //open a databse connection
 db_connect();
 
-require $opt['rootpath'] . 'lib/auth.inc.php';
-require_once $opt['rootpath'] . 'lib2/translate.class.php';
+require $opt['rootpath'].'lib/auth.inc.php';
+require_once $opt['rootpath'].'lib2/translate.class.php';
 
 //load language specific strings
-require_once $langpath . '/expressions.inc.php';
+require_once $langpath.'/expressions.inc.php';
 
 //set up the defaults for the main template
-require_once $stylepath . '/varset.inc.php';
+require_once $stylepath.'/varset.inc.php';
 
 if ($dblink === false) {
     //error while connecting to the database
@@ -156,7 +156,7 @@ 
         tpl_set_var('loginbox', $sLoggedOut);
         tpl_set_var(
             'login_url',
-            ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php'
+            ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php'
         );
     } else {
         //user logged in
@@ -170,7 +170,7 @@ 
 $ocpropping = isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], "Ocprop/") !== false;
 
 // zeitmessung
-require_once $rootpath . 'lib/bench.inc.php';
+require_once $rootpath.'lib/bench.inc.php';
 $bScriptExecution = new Cbench;
 $bScriptExecution->start();
 
@@ -334,12 +334,12 @@ 
     // country dropdown
     global $tpl_usercountries;
 
-    tpl_set_var('screen_css_time', filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_screen.css"));
+    tpl_set_var('screen_css_time', filemtime($opt['rootpath']."resource2/".$style."/css/style_screen.css"));
     tpl_set_var(
         'screen_msie_css_time',
-        filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_screen_msie.css")
+        filemtime($opt['rootpath']."resource2/".$style."/css/style_screen_msie.css")
     );
-    tpl_set_var('print_css_time', filemtime($opt['rootpath'] . "resource2/" . $style . "/css/style_print.css"));
+    tpl_set_var('print_css_time', filemtime($opt['rootpath']."resource2/".$style."/css/style_print.css"));
 
     if (isset($bScriptExecution)) {
         $bScriptExecution->Stop();
@@ -376,8 +376,8 @@ 
         $ltext = mb_ereg_replace('%1', $lurl, $ltext);
         $ltext = mb_ereg_replace('{site}', $opt['page']['sitename'], $ltext);
 
-        $ld = '<p class="sidebar-maintitle">' . $translate->t('Datalicense', '', '', 0) . '</p>' .
-            '<div style="margin:20px 0 16px 0; width:100%; text-align:center;">' . $ltext . '</div>';
+        $ld = '<p class="sidebar-maintitle">'.$translate->t('Datalicense', '', '', 0).'</p>'.
+            '<div style="margin:20px 0 16px 0; width:100%; text-align:center;">'.$ltext.'</div>';
         tpl_set_var('license_disclaimer', $ld);
     } else {
         tpl_set_var('license_disclaimer', '');
@@ -425,25 +425,25 @@ 
     sql_free_result($rsUserCountries);
 
     //include language specific expressions, so that they are available in the template code
-    include $langpath . '/expressions.inc.php';
+    include $langpath.'/expressions.inc.php';
 
     //load main template
     tpl_set_var('backgroundimage', '<div id="bg1">&nbsp;</div><div id="bg2">&nbsp;</div>');
     tpl_set_var('bodystyle', '');
 
     if (isset($_REQUEST['print']) && $_REQUEST['print'] == 'y') {
-        $sCode = read_file($stylepath . '/main_print.tpl.php');
+        $sCode = read_file($stylepath.'/main_print.tpl.php');
     } else {
         if (isset($_REQUEST['popup']) && $_REQUEST['popup'] == 'y') {
-            $sCode = read_file($stylepath . '/popup.tpl.php');
+            $sCode = read_file($stylepath.'/popup.tpl.php');
         } else {
-            $sCode = read_file($stylepath . '/main.tpl.php');
+            $sCode = read_file($stylepath.'/main.tpl.php');
         }
     }
-    $sCode = '?>' . $sCode;
+    $sCode = '?>'.$sCode;
 
     //does template exist?
-    if (!file_exists($stylepath . '/' . $tplname . '.tpl.php')) {
+    if (!file_exists($stylepath.'/'.$tplname.'.tpl.php')) {
         //set up the error template
         $error = true;
         tpl_set_var('error_msg', htmlspecialchars($error_pagenotexist, ENT_COMPAT, 'UTF-8'));
@@ -452,7 +452,7 @@ 
     }
 
     //read the template
-    $sTemplate = read_file($stylepath . '/' . $tplname . '.tpl.php');
+    $sTemplate = read_file($stylepath.'/'.$tplname.'.tpl.php');
     $sCode = mb_ereg_replace('{template}', $sTemplate, $sCode);
 
     //process translations
@@ -492,7 +492,7 @@ 
     // Date in the past
     header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
     // always modified
-    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+    header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 }
 
 //redirect to another site to display, i.e. to view a cache after logging
@@ -504,9 +504,9 @@ 
     http_write_no_cache();
 
     if (!preg_match('/^https?:/i', $page)) {
-        header("Location: " . $absolute_server_URI . $page);
+        header("Location: ".$absolute_server_URI.$page);
     } else {
-        header("Location: " . $page);
+        header("Location: ".$page);
     }
 
     exit;
@@ -522,17 +522,17 @@ 
     if (is_array($vars)) {
         foreach ($vars as $varname => $varvalue) {
             if ($no_eval_vars[$varname] == false) {
-                $str = mb_ereg_replace('{' . $varname . '}', $varvalue, $str);
+                $str = mb_ereg_replace('{'.$varname.'}', $varvalue, $str);
             } else {
-                $replave_var_name = 'tpl_replace_var_' . $varname;
+                $replave_var_name = 'tpl_replace_var_'.$varname;
 
                 global $$replave_var_name;
                 $$replave_var_name = $varvalue;
 
                 //replace using php-echo
                 $str = mb_ereg_replace(
-                    '{' . $varname . '}',
-                    '<?php global $' . $replave_var_name . '; echo $tpl_replace_var_' . $varname . '; ?>',
+                    '{'.$varname.'}',
+                    '<?php global $'.$replave_var_name.'; echo $tpl_replace_var_'.$varname.'; ?>',
                     $str
                 );
             }
@@ -565,7 +565,7 @@ 
     }
     $opt['template']['locale'] = $locale;
 
-    bindtextdomain('messages', $rootpath . '/cache2/translate');
+    bindtextdomain('messages', $rootpath.'/cache2/translate');
     set_php_locale();
     textdomain('messages');
 }
@@ -603,7 +603,7 @@ 
     $sResultCode = '';
     $nCurrentPos = 0;
     while ($nCurrentPos < mb_strlen($sCode)) {
-        $nStartOf = mb_strpos($sCode, '{' . 't}', $nCurrentPos);
+        $nStartOf = mb_strpos($sCode, '{'.'t}', $nCurrentPos);
         if ($nStartOf === false) {
             $sResultCode .= mb_substr($sCode, $nCurrentPos, mb_strlen($sCode) - $nCurrentPos);
             $nCurrentPos = mb_strlen($sCode);
@@ -633,8 +633,8 @@ 
 
     $str = $translate->t($str, '', basename(__FILE__), __LINE__);
     $args = func_get_args();
-    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex --) {
-        $str = str_replace('%' . $nIndex, $args[$nIndex], $str);
+    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex--) {
+        $str = str_replace('%'.$nIndex, $args[$nIndex], $str);
     }
 
     return $str;
@@ -666,7 +666,7 @@ 
 
     // user specified a country?
     if (isset($usr) && ($usr !== false)) {
-        $sCountry = sqlValue("SELECT `country` FROM `user` WHERE `user_id`='" . ($usr['userid'] + 0) . "'", null);
+        $sCountry = sqlValue("SELECT `country` FROM `user` WHERE `user_id`='".($usr['userid'] + 0)."'", null);
         if ($sCountry != null) {
             return $sCountry;
         }
@@ -732,14 +732,14 @@ 
     mysql_free_result($rs);
 
     $imgtitle = $translate->t('Instructions', '', basename(__FILE__), __LINE__);
-    $imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
+    $imgtitle = "alt='".$imgtitle."' title='".$imgtitle."'";
 
     if (substr($helppage, 0, 1) == "!") {
-        return "<a class='nooutline' href='" . substr($helppage, 1) . "' " . $imgtitle . " target='_blank'>";
+        return "<a class='nooutline' href='".substr($helppage, 1)."' ".$imgtitle." target='_blank'>";
     } else {
         if ($helppage != "" && isset($opt['locale'][$help_locale]['helpwiki'])) {
-            return "<a class='nooutline' href='" . $opt['locale'][$help_locale]['helpwiki'] .
-            str_replace(' ', '_', $helppage) . "' " . $imgtitle . " target='_blank'>";
+            return "<a class='nooutline' href='".$opt['locale'][$help_locale]['helpwiki'].
+            str_replace(' ', '_', $helppage)."' ".$imgtitle." target='_blank'>";
         }
     }
 

htdocs/lib/sqldebugger.inc.php

Doc Comments +3 added lines

@@ -149,6 +149,9 @@
     <?php
 }
 
+/**
+ * @param string $sql
+ */
 function sqldbg_execute($sql, $bSlave)
 {
     global $dblink;

Spacing +22 added lines, -22 removed lines

@@ -9,7 +9,7 @@ 
  * Unicode Reminder メモ
  ****************************************************************************/
 
-require_once $opt['rootpath'] . 'lib/bench.inc.php';
+require_once $opt['rootpath'].'lib/bench.inc.php';
 
 $sqldbg_cmdNo = 0;
 $sqldbg_sumTimes = 0;
@@ -155,9 +155,9 @@ 
     global $sqldbg_cmdNo;
     global $sqldbg_sumTimes;
 
-    $sqldbg_cmdNo ++;
+    $sqldbg_cmdNo++;
 
-    echo '<p class="sqlno"><span class="white">/*</span> SQL command ' . $sqldbg_cmdNo . ' ';
+    echo '<p class="sqlno"><span class="white">/*</span> SQL command '.$sqldbg_cmdNo.' ';
     if ($bSlave) {
         echo '<span class="slave_title">(slave)</span>';
     }
@@ -224,19 +224,19 @@ 
         $bFirstLine = true;
         $nLine = 0;
         $rs = mysql_query($sqlexplain, $dblink);
-        echo '<div class="selrows">Number of selected rows: ' . mysql_num_rows($rs) . '</div>';
+        echo '<div class="selrows">Number of selected rows: '.mysql_num_rows($rs).'</div>';
 
         echo '<table class="firstresultrow" border="1">';
 
         while ($r = sql_fetch_assoc($rs)) {
             $usebr = true;
-            $nLine ++;
+            $nLine++;
             if ($bFirstLine == true) {
-                echo '<tr>' . "\n";
+                echo '<tr>'."\n";
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>' . "\n";
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>'."\n";
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
             }
 
             if ($bFirstLine) {
@@ -246,9 +246,9 @@ 
             }
 
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8') . '</td>';
+                echo '<td>'.htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8').'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
 
             if ($nLine == 25) {
                 break;
@@ -261,27 +261,27 @@ 
         echo '<table class="explain" border="1">';
 
         $bFirstLine = true;
-        $rs = mysql_query('EXPLAIN EXTENDED ' . $sqlexplain);
+        $rs = mysql_query('EXPLAIN EXTENDED '.$sqlexplain);
         while ($r = sql_fetch_assoc($rs)) {
             if ($bFirstLine == true) {
                 echo '<tr>';
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>';
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>';
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
 
                 $bFirstLine = false;
             }
 
             echo '<tr>';
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(
+                echo '<td>'.htmlspecialchars(
                     ($value != null) ? mb_ereg_replace('\*/', '* /', $value) : 'NULL',
                     ENT_COMPAT,
                     'UTF-8'
-                ) . '</td>';
+                ).'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
         }
         echo '</table>';
         $usebr = true;
@@ -303,14 +303,14 @@ 
         echo '<table>';
         $rs = mysql_query('SHOW WARNINGS', $dblink);
         while ($r = sql_fetch_assoc($rs)) {
-            echo '<tr><td>' . htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8') . '</td></tr>';
+            echo '<tr><td>'.htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8').'</td></tr>';
         }
         echo '</table>';
         echo '</div>';
     }
 
-    echo '<div class="runtime">Runtime: ' . sprintf('%01.5f', $bSqlExecution->Diff()) . ' sek.</div>';
-    echo '<div class="affectedrows">Number of affected rows: ' . mysql_affected_rows($dblink) . '</div>';
+    echo '<div class="runtime">Runtime: '.sprintf('%01.5f', $bSqlExecution->Diff()).' sek.</div>';
+    echo '<div class="affectedrows">Number of affected rows: '.mysql_affected_rows($dblink).'</div>';
 
     echo '<div class="white">*/</div></div>';
 
@@ -322,7 +322,7 @@ 
     global $sqldbg_sumTimes;
 
     echo '<span class="white">/*</span><div class="allruntime"><hr>';
-    echo 'Runtime sum: ' . sprintf('%01.5f', $sqldbg_sumTimes) . ' sek.<span class="white">*/</span></div>';
+    echo 'Runtime sum: '.sprintf('%01.5f', $sqldbg_sumTimes).' sek.<span class="white">*/</span></div>';
 
     echo '</body></html>';
     exit;
@@ -347,13 +347,13 @@ 
         return '';
     }
 
-    return 'SELECT * ' . mb_substr($sql, $start);
+    return 'SELECT * '.mb_substr($sql, $start);
 }
 
 function sqldbg_insert_nocache($sql)
 {
     if (mb_strtoupper(mb_substr($sql, 0, 7)) == 'SELECT ') {
-        $sql = 'SELECT SQL_NO_CACHE ' . mb_substr($sql, 7);
+        $sql = 'SELECT SQL_NO_CACHE '.mb_substr($sql, 7);
     }
 
     return $sql;

htdocs/lib2/db.inc.php

Doc Comments +60 added lines

@@ -341,6 +341,9 @@ 
     return $result;
 }
 
+/**
+ * @param string $sql
+ */
 function sqlf($sql)
 {
     global $db;
@@ -354,6 +357,9 @@ 
     return $result;
 }
 
+/**
+ * @param string $sql
+ */
 function sqlf_slave($sql)
 {
     global $db;
@@ -367,6 +373,9 @@ 
     return $result;
 }
 
+/**
+ * @param string $sql
+ */
 function sqll($sql)
 {
     global $db;
@@ -380,6 +389,10 @@ 
     return $result;
 }
 
+/**
+ * @param string $sql
+ * @param integer $default
+ */
 function sqlf_value($sql, $default)
 {
     global $db;
@@ -394,6 +407,10 @@ 
     return $result;
 }
 
+/**
+ * @param string $sql
+ * @param integer $default
+ */
 function sqll_value($sql, $default)
 {
     global $db;
@@ -474,6 +491,9 @@ 
     return sql_value_internal(true, $sql, $default, $args);
 }
 
+/**
+ * @param boolean $bQuerySlave
+ */
 function sql_value_internal($bQuerySlave, $sql, $default)
 {
     $args = func_get_args();
@@ -576,6 +596,9 @@ 
     return $retval;
 }
 
+/**
+ * @param resource $rs
+ */
 function sql_fetch_column($rs)
 {
     global $opt;
@@ -625,11 +648,17 @@ 
     return mysql_insert_id($db['dblink_slave']);
 }
 
+/**
+ * @param resource $rs
+ */
 function sql_num_rows($rs)
 {
     return mysql_num_rows($rs);
 }
 
+/**
+ * @param string $table
+ */
 function sql_temp_table($table)
 {
     global $db, $opt;
@@ -659,6 +688,9 @@ 
     $db['temptables'][$table] = $table;
 }
 
+/**
+ * @param string $table
+ */
 function sql_temp_table_slave($table)
 {
     global $db, $opt;
@@ -679,6 +711,9 @@ 
     $db['temptables_slave'][$table] = $table;
 }
 
+/**
+ * @param string $table
+ */
 function sql_drop_temp_table($table)
 {
     global $db, $opt;
@@ -715,6 +750,9 @@ 
     $db['temptables'][$newname] = $newname;
 }
 
+/**
+ * @param string $table
+ */
 function sql_drop_temp_table_slave($table)
 {
     global $db, $opt;
@@ -1079,6 +1117,9 @@ 
     }
 }
 
+/**
+ * @param string $warnmessage
+ */
 function sql_warn($warnmessage)
 {
     global $opt;
@@ -1105,6 +1146,9 @@ 
     }
 }
 
+/**
+ * @param resource $rs
+ */
 function sql_export_recordset($f, $rs, $table, $truncate = true)
 {
     fwrite($f, "SET NAMES 'utf8';\n");
@@ -1135,6 +1179,9 @@ 
     }
 }
 
+/**
+ * @param resource $f
+ */
 function sql_export_table($f, $table)
 {
     $primary = array();
@@ -1156,6 +1203,10 @@ 
     sql_free_result($rs);
 }
 
+/**
+ * @param string $filename
+ * @param string[] $tables
+ */
 function sql_export_tables_to_file($filename, $tables)
 {
     $f = fopen($filename, 'w');
@@ -1183,6 +1234,9 @@ 
     fclose($f);
 }
 
+/**
+ * @param resource $f
+ */
 function sql_export_structure($f, $table)
 {
     $rs = sql("SHOW CREATE TABLE `&1`", $table);
@@ -1198,6 +1252,9 @@ 
     fwrite($f, $sTableSql . " ;\n");
 }
 
+/**
+ * @param string $filename
+ */
 function sql_export_structure_to_file($filename, $table)
 {
     $f = fopen($filename, 'w');
@@ -1271,6 +1328,9 @@ 
 }
 
 // test if a function or procedure exists
+/**
+ * @param string $type
+ */
 function sql_fp_exists($type, $name)
 {
     global $opt;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1275,7 +1275,7 @@
 {
     global $opt;
 
-    $rs = sql("SHOW $type STATUS LIKE '&1'", $name);
+    $rs = sql("show $type STATUS LIKE '&1'", $name);
     $r = sql_fetch_assoc($rs);
     sql_free_result($rs);
 

Spacing +40 added lines, -40 removed lines

@@ -185,10 +185,10 @@ 
         // & escaped?
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 1) {
-            $nextarg ++;
+            $nextarg++;
         } else {
             $nextchar = substr($sql, $nextarg + 1, 1);
             if (is_numeric($nextchar)) {
@@ -199,7 +199,7 @@ 
                 while (preg_match('/^[0-9]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -225,13 +225,13 @@ 
                         // strip apostroph and insert NULL
                         $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1);
                         $filtered_sql .= 'NULL';
-                        $sqlpos ++;
+                        $sqlpos++;
                     } else {
                         $filtered_sql .= 'NULL';
                     }
                 }
 
-                $sqlpos ++;
+                $sqlpos++;
             } else {
                 $arglength = 0;
                 $arg = '';
@@ -241,7 +241,7 @@ 
                 while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -263,7 +263,7 @@ 
                         $filtered_sql .= '`';
                     }
 
-                    $filtered_sql .= sql_escape_backtick($opt['db']['placeholder']['tmpdb']) . '`.`' . sql_escape_backtick($db['temptables'][$arg]);
+                    $filtered_sql .= sql_escape_backtick($opt['db']['placeholder']['tmpdb']).'`.`'.sql_escape_backtick($db['temptables'][$arg]);
 
                     if (substr($sql, $nextarg + $arglength + 1, 1) != '`') {
                         $filtered_sql .= '`';
@@ -288,12 +288,12 @@ 
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0)
             && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 0) {
             // strip escapes of &
-            $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2);
-            $nextarg --;
+            $filtered_sql = substr($filtered_sql, 0, $nextarg).'&'.substr($filtered_sql, $nextarg + 2);
+            $nextarg--;
         }
 
         $nextarg = strpos($filtered_sql, '\&', $nextarg + 2);
@@ -310,7 +310,7 @@ 
     */
 
     if (isset($db['debug']) && ($db['debug'] == true)) {
-        require_once $opt['rootpath'] . 'lib2/sqldebugger.class.php';
+        require_once $opt['rootpath'].'lib2/sqldebugger.class.php';
         $result = $sqldebugger->execute($filtered_sql, $dblink, ($dblink === $db['dblink_slave']), $db['slave_server']);
         if ($result === false) {
             sql_error($filtered_sql);
@@ -318,7 +318,7 @@ 
     } else {
         // measure time
         if ($opt['db']['warn']['time'] > 0) {
-            require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+            require_once $opt['rootpath'].'lib2/bench.inc.php';
             $cSqlExecution = new Cbench;
             $cSqlExecution->start();
         }
@@ -332,8 +332,8 @@ 
             $cSqlExecution->stop();
 
             if ($cSqlExecution->diff() > $opt['db']['warn']['time']) {
-                $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n" . $_SERVER['HTTP_USER_AGENT'] : "";
-                sql_warn("execution took " . $cSqlExecution->diff() . " seconds" . $ua);
+                $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n".$_SERVER['HTTP_USER_AGENT'] : "";
+                sql_warn("execution took ".$cSqlExecution->diff()." seconds".$ua);
             }
         }
     }
@@ -774,7 +774,7 @@ 
     }
 
     if ($db['dblink'] !== false) {
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink']) . "'", $db['dblink']);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $db['dblink'])."'", $db['dblink']);
 
         //database connection established ... set the used database
         if (@mysql_select_db($opt['db']['placeholder']['db'], $db['dblink']) == false) {
@@ -837,7 +837,7 @@ 
         AND `online`= 1
         AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1')
         ORDER BY `w` DESC LIMIT 1",
-        - 1,
+        -1,
         $nMaxTimeDiff
     );
 
@@ -898,7 +898,7 @@ 
             sql_error();
         }
 
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave']) . "'", $db['dblink_slave']);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave'])."'", $db['dblink_slave']);
 
         // initialize temp tables on slave server
         $rs = sqlf_slave("SELECT `threadid`, `name` FROM `sys_temptables` WHERE `threadid`='&1'", mysql_thread_id($db['dblink_slave']));
@@ -1010,7 +1010,7 @@ 
     $errno = mysql_errno();
     $error = mysql_error();
     if ($sqlstatement != "") {
-        $error .= "\n\nSQL statement: " . $sqlstatement;
+        $error .= "\n\nSQL statement: ".$sqlstatement;
     }
 
     if ($db['error'] == true) {
@@ -1019,7 +1019,7 @@ 
         // could not load translations from database)
 
         if ($opt['db']['error']['display'] == true) {
-            $errmsg = 'MySQL error recursion (' . $errno . '): ' . $error;
+            $errmsg = 'MySQL error recursion ('.$errno.'): '.$error;
         } else {
             $errmsg = "";
         }
@@ -1034,13 +1034,13 @@ 
     }
 
     if ($opt['db']['error']['mail'] != '') {
-        $subject = '[' . $opt['page']['domain'] . '] SQL error';
+        $subject = '['.$opt['page']['domain'].'] SQL error';
         if (admin_errormail($opt['db']['error']['mail'],
             $subject,
-            str_replace("\n", "\r\n", $error) . "\n" . print_r(debug_backtrace(), true),
-            "From: " . $opt['mail']['from']
+            str_replace("\n", "\r\n", $error)."\n".print_r(debug_backtrace(), true),
+            "From: ".$opt['mail']['from']
         )) {
-            require_once $opt['rootpath'] . 'lib2/mail.class.php';
+            require_once $opt['rootpath'].'lib2/mail.class.php';
 
             $mail = new mail();
             $mail->subject = $subject;
@@ -1060,13 +1060,13 @@ 
     if ($opt['gui'] == GUI_HTML) {
         if (isset($tpl)) {
             if ($opt['db']['error']['display'] == true) {
-                $tpl->error('MySQL error (' . $errno . '): ' . $error);
+                $tpl->error('MySQL error ('.$errno.'): '.$error);
             } else {
                 $tpl->error('A database command could not be performed.');
             }
         } else {
             if ($opt['db']['error']['display'] == true) {
-                die('<html><body>' . htmlspecialchars('MySQL error (' . $errno . '): ' . str_replace("\n,", "<br />", $error)) . '</body></html>');
+                die('<html><body>'.htmlspecialchars('MySQL error ('.$errno.'): '.str_replace("\n,", "<br />", $error)).'</body></html>');
             } else {
                 die('<html><body>A database command could not be performed</body></html>');
             }
@@ -1074,7 +1074,7 @@ 
     } else {
         // CLI script, simple text output
         if ($opt['db']['error']['display'] == true) {
-            die('MySQL error (' . $errno . '): ' . $error . "\n");
+            die('MySQL error ('.$errno.'): '.$error."\n");
         } else {
             die("A database command could not be performed.\n");
         }
@@ -1086,13 +1086,13 @@ 
     global $opt;
 
     if ($opt['db']['error']['mail'] != '') {
-        $subject = '[' . $opt['page']['domain'] . '] SQL error';
+        $subject = '['.$opt['page']['domain'].'] SQL error';
         if (admin_errormail($opt['db']['error']['mail'],
             $subject,
-            $warnmessage . "\n" . print_r(debug_backtrace(), true),
-            "From: " . $opt['mail']['from']
+            $warnmessage."\n".print_r(debug_backtrace(), true),
+            "From: ".$opt['mail']['from']
         )) {
-            require_once $opt['rootpath'] . 'lib2/mail.class.php';
+            require_once $opt['rootpath'].'lib2/mail.class.php';
             $mail = new mail();
             $mail->name = 'sql_warn';
             $mail->subject = $subject;
@@ -1112,7 +1112,7 @@ 
     fwrite($f, "SET NAMES 'utf8';\n");
 
     if ($truncate == true) {
-        fwrite($f, "TRUNCATE TABLE `" . sql_escape($table) . "`;\n");
+        fwrite($f, "TRUNCATE TABLE `".sql_escape($table)."`;\n");
     }
 
     while ($r = sql_fetch_assoc($rs)) {
@@ -1120,19 +1120,19 @@ 
         $values = array();
 
         foreach ($r as $k => $v) {
-            $fields[] = '`' . sql_escape($k) . '`';
+            $fields[] = '`'.sql_escape($k).'`';
             if ($v === null) {
                 $values[] = "NULL";
             } else {
-                $values[] = "'" . sql_escape($v) . "'";
+                $values[] = "'".sql_escape($v)."'";
             }
         }
         unset($r);
 
         fwrite(
             $f,
-            "INSERT INTO `" . sql_escape($table) . "` (" . implode(', ', $fields) . ")"
-            . " VALUES (" . implode(', ', $values) . ");\n"
+            "INSERT INTO `".sql_escape($table)."` (".implode(', ', $fields).")"
+            . " VALUES (".implode(', ', $values).");\n"
         );
     }
 }
@@ -1143,14 +1143,14 @@ 
     $rsIndex = sql("SHOW INDEX FROM `&1`", $table);
     while ($r = sql_fetch_assoc($rsIndex)) {
         if ($r['Key_name'] == 'PRIMARY') {
-            $primary[] = '`' . sql_escape($r['Column_name']) . '` ASC';
+            $primary[] = '`'.sql_escape($r['Column_name']).'` ASC';
         }
     }
     sql_free_result($rsIndex);
 
-    $sql = "SELECT * FROM `" . sql_escape($table) . "`";
+    $sql = "SELECT * FROM `".sql_escape($table)."`";
     if (count($primary) > 0) {
-        $sql .= ' ORDER BY ' . implode(', ', $primary);
+        $sql .= ' ORDER BY '.implode(', ', $primary);
     }
 
     $rs = sql($sql);
@@ -1196,8 +1196,8 @@ 
     $sTableSql = preg_replace("/,\n +?(KEY )?`okapi_syncbase`.+?(,)?\n/", "\\2\n", $sTableSql);
 
     fwrite($f, "SET NAMES 'utf8';\n");
-    fwrite($f, "DROP TABLE IF EXISTS `" . sql_escape($table) . "`;\n");
-    fwrite($f, $sTableSql . " ;\n");
+    fwrite($f, "DROP TABLE IF EXISTS `".sql_escape($table)."`;\n");
+    fwrite($f, $sTableSql." ;\n");
 }
 
 function sql_export_structure_to_file($filename, $table)

htdocs/lib2/edithelper.inc.php

Doc Comments +3 added lines

@@ -58,6 +58,9 @@
 //
 // If $wrap is > 0, longer lines will be wrapped to new lines.
 
+/**
+ * @param integer $wrap
+ */
 function html2plaintext($text, $texthtml0, $wrap)
 {
     global $opt, $smiley;

Spacing +4 added lines, -4 removed lines

@@ -83,10 +83,10 @@ 
         $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
     } else {
         // convert smilies ...
-        for ($n = 0; $n < count($smiley['image']); $n ++) {
+        for ($n = 0; $n < count($smiley['image']); $n++) {
             $text = mb_ereg_replace(
-                "<img [^>]*?src=[^>]+?" . str_replace('.', '\.', $smiley['file'][$n]) . "[^>]+?>",
-                "[s![" . $smiley['text'][$n] . "]!s]",
+                "<img [^>]*?src=[^>]+?".str_replace('.', '\.', $smiley['file'][$n])."[^>]+?>",
+                "[s![".$smiley['text'][$n]."]!s]",
                 $text
             );
             // the [s[ ]s] is needed to protect the spaces around the smileys
@@ -118,5 +118,5 @@ 
 
 function editorJsPath()
 {
-    return 'resource2/ocstyle/js/editor.js?ft=' . filemtime('resource2/ocstyle/js/editor.js');
+    return 'resource2/ocstyle/js/editor.js?ft='.filemtime('resource2/ocstyle/js/editor.js');
 }

htdocs/lib2/errorhandler.inc.php

Doc Comments +4 added lines

@@ -106,6 +106,10 @@
 // throttle admin error mails;
 // currently used only for SQL errors and warnings
 
+/**
+ * @param string $errortype
+ * @param string $message
+ */
 function admin_errormail($to, $errortype, $message, $headers)
 {
     global $opt;

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
             $errmsg = "";
         }
 
-        require __DIR__ . '/../html/error.php';
+        require __DIR__.'/../html/error.php';
         exit;
     }
 }
@@ -67,8 +67,8 @@ 
     ) {
         $error_handled = true;
 
-        $error = "(" . $error['type'] . ") " . $error['message'] .
-            " at line " . $error['line'] . " of " . $error['file'];
+        $error = "(".$error['type'].") ".$error['message'].
+            " at line ".$error['line']." of ".$error['file'];
         php_errormail($error);
 
         $errtitle = "PHP-Fehler";
@@ -77,7 +77,7 @@ 
             $errmsg = $error;
         }
 
-        require __DIR__ . '/../html/error.php';
+        require __DIR__.'/../html/error.php';
     }
 }
 
@@ -94,7 +94,7 @@ 
     global $opt, $sql_errormail, $absolute_server_URI;
 
     $sendMail = true;
-    $subject = '[' . $opt['page']['domain'] . '] PHP error';
+    $subject = '['.$opt['page']['domain'].'] PHP error';
 
     if (isset($opt['db']['error']['mail']) && $opt['db']['error']['mail'] != '') {
         $sendMail = mb_send_mail($opt['db']['error']['mail'], $subject, $errmsg);
@@ -114,10 +114,10 @@ 
 function admin_errormail($to, $errortype, $message, $headers)
 {
     global $opt;
-    $errorlog_dir = $opt['rootpath'] . 'var/errorlog';
-    $errorlog_path = $errorlog_dir . "/errorlog-" . date("Y-m-d");
+    $errorlog_dir = $opt['rootpath'].'var/errorlog';
+    $errorlog_path = $errorlog_dir."/errorlog-".date("Y-m-d");
 
-    $error_mail_limit = 32768;    // send max 32 KB = ca. 5-20 errors per day/logfile
+    $error_mail_limit = 32768; // send max 32 KB = ca. 5-20 errors per day/logfile
 
     // All errors which may happen here are ignored, to avoid error recursions.
 
@@ -125,7 +125,7 @@ 
         @mkdir($errorlog_dir);
     }
     $old_logsize = @filesize($errorlog_path) + 0;
-    $msg = date("Y-m-d H:i:s.u") . " " . $errortype . "\n" . $message . "\n" .
+    $msg = date("Y-m-d H:i:s.u")." ".$errortype."\n".$message."\n".
         "-------------------------------------------------------------------------\n\n";
     try {
         error_log(
@@ -143,9 +143,9 @@ 
     if ($old_logsize < $error_mail_limit && $new_logsize >= $error_mail_limit) {
         mb_send_mail(
             $to,
-            "too many " . $errortype,
-            "Errors/Warnings are recorded in " . $errorlog_path . ".\n" .
-            "Email Reporting is DISABLED for today now. Please check the logfile\n" .
+            "too many ".$errortype,
+            "Errors/Warnings are recorded in ".$errorlog_path.".\n".
+            "Email Reporting is DISABLED for today now. Please check the logfile\n".
             "and RENAME or delete it when done, so that logging is re-enabled.",
             $headers
         );

htdocs/lib2/imagebmp.inc.php

Doc Comments +17 added lines

@@ -26,6 +26,9 @@ 
 *           Returns: if $file specified - true if OK
                      if $file not specified - image data
 */
+/**
+ * @param resource $img
+ */
 function imagebmp($img,$file="",$RLE=0)
 {
 
@@ -463,6 +466,9 @@ 
 
 
 
+/**
+ * @param integer $byte
+ */
 function RetBits($byte,$start,$len)
 {
 $bin=decbin8($byte);
@@ -474,6 +480,10 @@ 
 
 
 $CurrentBit=0;
+/**
+ * @param resource $f
+ * @param integer $count
+ */
 function freadbits($f,$count)
 {
  global $CurrentBit,$SMode;
@@ -505,6 +515,10 @@ 
         {
                 return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
         }
+
+        /**
+         * @param integer $n
+         */
         function int_to_word($n)
         {
                 return chr($n & 255).chr(($n >> 8) & 255);
@@ -516,6 +530,9 @@ 
 return decbinx($d,8);
 };
 
+/**
+ * @param integer $n
+ */
 function decbinx($d,$n)
 {
 $bin=decbin($d);

Indentation +189 added lines, -189 removed lines

@@ -78,83 +78,83 @@ 
                 $sl1=strlen($ret);
                 if($CC==0) $CC=256;
                 if($BitCount<24)
-                   {
+                    {
                     $ColorTotal=imagecolorstotal($img);
-                     if($IsTransparent) $ColorTotal--;
+                        if($IsTransparent) $ColorTotal--;
 
-                     for($p=0;$p<$ColorTotal;$p++)
-                     {
-                      $color=imagecolorsforindex($img,$p);
-                       $ret.=inttobyte($color["blue"]);
-                       $ret.=inttobyte($color["green"]);
-                       $ret.=inttobyte($color["red"]);
-                       $ret.=inttobyte(0); //RESERVED
-                     };
+                        for($p=0;$p<$ColorTotal;$p++)
+                        {
+                        $color=imagecolorsforindex($img,$p);
+                        $ret.=inttobyte($color["blue"]);
+                        $ret.=inttobyte($color["green"]);
+                        $ret.=inttobyte($color["red"]);
+                        $ret.=inttobyte(0); //RESERVED
+                        };
 
                     $CT=$ColorTotal;
-                  for($p=$ColorTotal;$p<$CC;$p++)
-                       {
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0); //RESERVED
-                     };
-                   };
+                    for($p=$ColorTotal;$p<$CC;$p++)
+                        {
+                        $ret.=inttobyte(0);
+                        $ret.=inttobyte(0);
+                        $ret.=inttobyte(0);
+                        $ret.=inttobyte(0); //RESERVED
+                        };
+                    };
 
 
 if($BitCount<=8)
 {
 
- for($y=$Height-1;$y>=0;$y--)
- {
-  $bWrite="";
-  for($x=0;$x<$Width;$x++)
-   {
-   $color=imagecolorat($img,$x,$y);
-   $bWrite.=decbinx($color,$BitCount);
-   if(strlen($bWrite)==8)
+    for($y=$Height-1;$y>=0;$y--)
+    {
+    $bWrite="";
+    for($x=0;$x<$Width;$x++)
     {
-     $retd.=inttobyte(bindec($bWrite));
-     $bWrite="";
+    $color=imagecolorat($img,$x,$y);
+    $bWrite.=decbinx($color,$BitCount);
+    if(strlen($bWrite)==8)
+    {
+        $retd.=inttobyte(bindec($bWrite));
+        $bWrite="";
+    };
     };
-   };
 
-  if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
+    if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
     {
-     $sl=strlen($bWrite);
-     for($t=0;$t<8-$sl;$t++)
-      $sl.="0";
-     $retd.=inttobyte(bindec($bWrite));
+        $sl=strlen($bWrite);
+        for($t=0;$t<8-$sl;$t++)
+        $sl.="0";
+        $retd.=inttobyte(bindec($bWrite));
+    };
+    for($z=0;$z<$Zbytek;$z++)
+    $retd.=inttobyte(0);
     };
- for($z=0;$z<$Zbytek;$z++)
-   $retd.=inttobyte(0);
- };
 };
 
 if(($RLE==1)and($BitCount==8))
 {
- for($t=0;$t<strlen($retd);$t+=4)
-  {
-   if($t!=0)
-   if(($t)%$Width==0)
+    for($t=0;$t<strlen($retd);$t+=4)
+    {
+    if($t!=0)
+    if(($t)%$Width==0)
     $ret.=chr(0).chr(0);
 
-   if(($t+5)%$Width==0)
-   {
-     $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0);
-     $t+=1;
-   }
-   if(($t+6)%$Width==0)
+    if(($t+5)%$Width==0)
+    {
+        $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0);
+        $t+=1;
+    }
+    if(($t+6)%$Width==0)
     {
-     $ret.=chr(0).chr(6).substr($retd,$t,6);
-     $t+=2;
+        $ret.=chr(0).chr(6).substr($retd,$t,6);
+        $t+=2;
     }
     else
     {
-     $ret.=chr(0).chr(4).substr($retd,$t,4);
+        $ret.=chr(0).chr(4).substr($retd,$t,4);
+    };
     };
-  };
-  $ret.=chr(0).chr(1);
+    $ret.=chr(0).chr(1);
 }
 else
 {
@@ -165,31 +165,31 @@ 
                 if($BitCount==24)
                 {
                 for($z=0;$z<$Zbytek;$z++)
-                 $Dopl.=chr(0);
+                    $Dopl.=chr(0);
 
                 for($y=$Height-1;$y>=0;$y--)
-                 {
-                 for($x=0;$x<$Width;$x++)
+                    {
+                    for($x=0;$x<$Width;$x++)
                         {
-                           $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
-                           $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
+                            $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
+                            $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
                         }
-                 $ret.=$Dopl;
-                 };
+                    $ret.=$Dopl;
+                    };
 
-                 };
+                    };
 
-  if($file!="")
-   {
+    if($file!="")
+    {
     $r=($f=fopen($file,"w"));
     $r=$r and fwrite($f,$ret);
     $r=$r and fclose($f);
     return $r;
-   }
-  else
-  {
-   echo $ret;
-  };
+    }
+    else
+    {
+    echo $ret;
+    };
 };
 
 
@@ -213,57 +213,57 @@ 
 
 if($Header=="BM")
 {
- $Size=freaddword($f);
- $Reserved1=freadword($f);
- $Reserved2=freadword($f);
- $FirstByteOfImage=freaddword($f);
-
- $SizeBITMAPINFOHEADER=freaddword($f);
- $Width=freaddword($f);
- $Height=freaddword($f);
- $biPlanes=freadword($f);
- $biBitCount=freadword($f);
- $RLECompression=freaddword($f);
- $WidthxHeight=freaddword($f);
- $biXPelsPerMeter=freaddword($f);
- $biYPelsPerMeter=freaddword($f);
- $NumberOfPalettesUsed=freaddword($f);
- $NumberOfImportantColors=freaddword($f);
+    $Size=freaddword($f);
+    $Reserved1=freadword($f);
+    $Reserved2=freadword($f);
+    $FirstByteOfImage=freaddword($f);
+
+    $SizeBITMAPINFOHEADER=freaddword($f);
+    $Width=freaddword($f);
+    $Height=freaddword($f);
+    $biPlanes=freadword($f);
+    $biBitCount=freadword($f);
+    $RLECompression=freaddword($f);
+    $WidthxHeight=freaddword($f);
+    $biXPelsPerMeter=freaddword($f);
+    $biYPelsPerMeter=freaddword($f);
+    $NumberOfPalettesUsed=freaddword($f);
+    $NumberOfImportantColors=freaddword($f);
 
 if($biBitCount<24)
- {
-  $img=imagecreate($Width,$Height);
-  $Colors=pow(2,$biBitCount);
-  for($p=0;$p<$Colors;$p++)
-   {
+    {
+    $img=imagecreate($Width,$Height);
+    $Colors=pow(2,$biBitCount);
+    for($p=0;$p<$Colors;$p++)
+    {
     $B=freadbyte($f);
     $G=freadbyte($f);
     $R=freadbyte($f);
     $Reserved=freadbyte($f);
     $Palette[]=imagecolorallocate($img,$R,$G,$B);
-   };
+    };
 
 
 
 
 if($RLECompression==0)
 {
-   $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
+    $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
 
 for($y=$Height-1;$y>=0;$y--)
     {
-     $CurrentBit=0;
-     for($x=0;$x<$Width;$x++)
-      {
-         $C=freadbits($f,$biBitCount);
-       imagesetpixel($img,$x,$y,$Palette[$C]);
-      };
+        $CurrentBit=0;
+        for($x=0;$x<$Width;$x++)
+        {
+            $C=freadbits($f,$biBitCount);
+        imagesetpixel($img,$x,$y,$Palette[$C]);
+        };
     if($CurrentBit!=0) {freadbyte($f);};
     for($g=0;$g<$Zbytek;$g++)
-     freadbyte($f);
-     };
+        freadbyte($f);
+        };
 
- };
+    };
 };
 
 
@@ -288,29 +288,29 @@ 
 
 while(!(($prefix==0)and($suffix==0)))
 {
- if($prefix==0)
-  {
-   $pocet=$suffix;
-   $Data.=fread($f,$pocet);
-   $pocetb+=$pocet;
-   if($pocetb%2==1) {freadbyte($f); $pocetb++;};
-  };
- if($prefix>0)
-  {
-   $pocet=$prefix;
-   for($r=0;$r<$pocet;$r++)
+    if($prefix==0)
+    {
+    $pocet=$suffix;
+    $Data.=fread($f,$pocet);
+    $pocetb+=$pocet;
+    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+    };
+    if($prefix>0)
+    {
+    $pocet=$prefix;
+    for($r=0;$r<$pocet;$r++)
     $Data.=chr($suffix);
-  };
- $prefix=freadbyte($f);
- $suffix=freadbyte($f);
- $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+    };
+    $prefix=freadbyte($f);
+    $suffix=freadbyte($f);
+    $pocetb+=2;
+    if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 };
 
 for($x=0;$x<strlen($Data);$x++)
- {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
- };
+    {
+    imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+    };
 $Data="";
 
 };
@@ -341,44 +341,44 @@ 
 
 while(!(($prefix==0)and($suffix==0)))
 {
- if($prefix==0)
-  {
-   $pocet=$suffix;
+    if($prefix==0)
+    {
+    $pocet=$suffix;
 
-   $CurrentBit=0;
-   for($h=0;$h<$pocet;$h++)
+    $CurrentBit=0;
+    for($h=0;$h<$pocet;$h++)
     $Data.=chr(freadbits($f,4));
-   if($CurrentBit!=0) freadbits($f,4);
-   $pocetb+=ceil(($pocet/2));
-   if($pocetb%2==1) {freadbyte($f); $pocetb++;};
-  };
- if($prefix>0)
-  {
-   $pocet=$prefix;
-   $i=0;
-   for($r=0;$r<$pocet;$r++)
+    if($CurrentBit!=0) freadbits($f,4);
+    $pocetb+=ceil(($pocet/2));
+    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+    };
+    if($prefix>0)
+    {
+    $pocet=$prefix;
+    $i=0;
+    for($r=0;$r<$pocet;$r++)
     {
     if($i%2==0)
-     {
-      $Data.=chr($suffix%16);
-     }
-     else
-     {
-      $Data.=chr(floor($suffix/16));
-     };
+        {
+        $Data.=chr($suffix%16);
+        }
+        else
+        {
+        $Data.=chr(floor($suffix/16));
+        };
     $i++;
     };
-  };
- $prefix=freadbyte($f);
- $suffix=freadbyte($f);
- $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+    };
+    $prefix=freadbyte($f);
+    $suffix=freadbyte($f);
+    $pocetb+=2;
+    if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 };
 
 for($x=0;$x<strlen($Data);$x++)
- {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
- };
+    {
+    imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+    };
 $Data="";
 
 };
@@ -386,25 +386,25 @@ 
 };
 
 
- if($biBitCount==24)
+    if($biBitCount==24)
 {
- $img=imagecreatetruecolor($Width,$Height);
- $Zbytek=$Width%4;
+    $img=imagecreatetruecolor($Width,$Height);
+    $Zbytek=$Width%4;
 
-   for($y=$Height-1;$y>=0;$y--)
+    for($y=$Height-1;$y>=0;$y--)
     {
-     for($x=0;$x<$Width;$x++)
-      {
-       $B=freadbyte($f);
-       $G=freadbyte($f);
-       $R=freadbyte($f);
-       $color=imagecolorexact($img,$R,$G,$B);
-       if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
-       imagesetpixel($img,$x,$y,$color);
-      }
+        for($x=0;$x<$Width;$x++)
+        {
+        $B=freadbyte($f);
+        $G=freadbyte($f);
+        $R=freadbyte($f);
+        $color=imagecolorexact($img,$R,$G,$B);
+        if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
+        imagesetpixel($img,$x,$y,$color);
+        }
     for($z=0;$z<$Zbytek;$z++)
-     freadbyte($f);
-   };
+        freadbyte($f);
+    };
 };
 return $img;
 
@@ -438,14 +438,14 @@ 
 
 function freadbyte($f)
 {
- return ord(fread($f,1));
+    return ord(fread($f,1));
 };
 
 function freadword($f)
 {
- $b1=freadbyte($f);
- $b2=freadbyte($f);
- return $b2*256+$b1;
+    $b1=freadbyte($f);
+    $b2=freadbyte($f);
+    return $b2*256+$b1;
 };
 
 
@@ -456,9 +456,9 @@ 
 
 function freaddword($f)
 {
- $b1=freadword($f);
- $b2=freadword($f);
- return $b2*65536+$b1;
+    $b1=freadword($f);
+    $b2=freadword($f);
+    return $b2*65536+$b1;
 };
 
 
@@ -476,30 +476,30 @@ 
 $CurrentBit=0;
 function freadbits($f,$count)
 {
- global $CurrentBit,$SMode;
- $Byte=freadbyte($f);
- $LastCBit=$CurrentBit;
- $CurrentBit+=$count;
- if($CurrentBit==8)
-  {
-   $CurrentBit=0;
-  }
- else
-  {
-   fseek($f,ftell($f)-1);
-  };
- return RetBits($Byte,$LastCBit,$count);
+    global $CurrentBit,$SMode;
+    $Byte=freadbyte($f);
+    $LastCBit=$CurrentBit;
+    $CurrentBit+=$count;
+    if($CurrentBit==8)
+    {
+    $CurrentBit=0;
+    }
+    else
+    {
+    fseek($f,ftell($f)-1);
+    };
+    return RetBits($Byte,$LastCBit,$count);
 };
 
 
 
 function RGBToHex($Red,$Green,$Blue)
-  {
-   $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed";
-   $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen";
-   $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue";
-   return($hRed.$hGreen.$hBlue);
-  };
+    {
+    $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed";
+    $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen";
+    $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue";
+    return($hRed.$hGreen.$hBlue);
+    };
 
         function int_to_dword($n)
         {
@@ -521,7 +521,7 @@ 
 $bin=decbin($d);
 $sbin=strlen($bin);
 for($j=0;$j<$n-$sbin;$j++)
- $bin="0$bin";
+    $bin="0$bin";
 return $bin;
 };
 

Spacing +234 added lines, -234 removed lines

@@ -26,164 +26,164 @@ 
 *           Returns: if $file specified - true if OK
                      if $file not specified - image data
 */
-function imagebmp($img,$file="",$RLE=0)
+function imagebmp($img, $file = "", $RLE = 0)
 {
 
 
-$ColorCount=imagecolorstotal($img);
+$ColorCount = imagecolorstotal($img);
 
-$Transparent=imagecolortransparent($img);
-$IsTransparent=$Transparent!=-1;
+$Transparent = imagecolortransparent($img);
+$IsTransparent = $Transparent != -1;
 
 
-if($IsTransparent) $ColorCount--;
+if ($IsTransparent) $ColorCount--;
 
-if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
-if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
-if(($ColorCount>2)and($ColorCount<=16)) { $ColorCount=16; $BitCount=4;};
-if(($ColorCount>16)and($ColorCount<=256)) { $ColorCount=0; $BitCount=8;};
+if ($ColorCount == 0) {$ColorCount = 0; $BitCount = 24; };
+if (($ColorCount > 0) and ($ColorCount <= 2)) {$ColorCount = 2; $BitCount = 1; };
+if (($ColorCount > 2) and ($ColorCount <= 16)) { $ColorCount = 16; $BitCount = 4; };
+if (($ColorCount > 16) and ($ColorCount <= 256)) { $ColorCount = 0; $BitCount = 8; };
 
 
-                $Width=imagesx($img);
-                $Height=imagesy($img);
+                $Width = imagesx($img);
+                $Height = imagesy($img);
 
-                $Zbytek=(4-($Width/(8/$BitCount))%4)%4;
+                $Zbytek = (4 - ($Width / (8 / $BitCount)) % 4) % 4;
 
-                if($BitCount<24) $palsize=pow(2,$BitCount)*4;
+                if ($BitCount < 24) $palsize = pow(2, $BitCount) * 4;
 
-                $size=(floor($Width/(8/$BitCount))+$Zbytek)*$Height+54;
-                $size+=$palsize;
-                $offset=54+$palsize;
+                $size = (floor($Width / (8 / $BitCount)) + $Zbytek) * $Height + 54;
+                $size += $palsize;
+                $offset = 54 + $palsize;
 
                 // Bitmap File Header
-                $ret = 'BM';                        // header (2b)
-                $ret .= int_to_dword($size);        // size of file (4b)
-                $ret .= int_to_dword(0);        // reserved (4b)
-                $ret .= int_to_dword($offset);        // byte location in the file which is first byte of IMAGE (4b)
+                $ret = 'BM'; // header (2b)
+                $ret .= int_to_dword($size); // size of file (4b)
+                $ret .= int_to_dword(0); // reserved (4b)
+                $ret .= int_to_dword($offset); // byte location in the file which is first byte of IMAGE (4b)
                 // Bitmap Info Header
-                $ret .= int_to_dword(40);        // Size of BITMAPINFOHEADER (4b)
-                $ret .= int_to_dword($Width);        // width of bitmap (4b)
-                $ret .= int_to_dword($Height);        // height of bitmap (4b)
-                $ret .= int_to_word(1);        // biPlanes = 1 (2b)
-                $ret .= int_to_word($BitCount);        // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b)
-                $ret .= int_to_dword($RLE);        // RLE COMPRESSION (4b)
-                $ret .= int_to_dword(0);        // width x height (4b)
-                $ret .= int_to_dword(0);        // biXPelsPerMeter (4b)
-                $ret .= int_to_dword(0);        // biYPelsPerMeter (4b)
-                $ret .= int_to_dword(0);        // Number of palettes used (4b)
-                $ret .= int_to_dword(0);        // Number of important colour (4b)
+                $ret .= int_to_dword(40); // Size of BITMAPINFOHEADER (4b)
+                $ret .= int_to_dword($Width); // width of bitmap (4b)
+                $ret .= int_to_dword($Height); // height of bitmap (4b)
+                $ret .= int_to_word(1); // biPlanes = 1 (2b)
+                $ret .= int_to_word($BitCount); // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b)
+                $ret .= int_to_dword($RLE); // RLE COMPRESSION (4b)
+                $ret .= int_to_dword(0); // width x height (4b)
+                $ret .= int_to_dword(0); // biXPelsPerMeter (4b)
+                $ret .= int_to_dword(0); // biYPelsPerMeter (4b)
+                $ret .= int_to_dword(0); // Number of palettes used (4b)
+                $ret .= int_to_dword(0); // Number of important colour (4b)
                 // image data
 
-                $CC=$ColorCount;
-                $sl1=strlen($ret);
-                if($CC==0) $CC=256;
-                if($BitCount<24)
+                $CC = $ColorCount;
+                $sl1 = strlen($ret);
+                if ($CC == 0) $CC = 256;
+                if ($BitCount < 24)
                    {
-                    $ColorTotal=imagecolorstotal($img);
-                     if($IsTransparent) $ColorTotal--;
+                    $ColorTotal = imagecolorstotal($img);
+                     if ($IsTransparent) $ColorTotal--;
 
-                     for($p=0;$p<$ColorTotal;$p++)
+                     for ($p = 0; $p < $ColorTotal; $p++)
                      {
-                      $color=imagecolorsforindex($img,$p);
-                       $ret.=inttobyte($color["blue"]);
-                       $ret.=inttobyte($color["green"]);
-                       $ret.=inttobyte($color["red"]);
-                       $ret.=inttobyte(0); //RESERVED
+                      $color = imagecolorsforindex($img, $p);
+                       $ret .= inttobyte($color["blue"]);
+                       $ret .= inttobyte($color["green"]);
+                       $ret .= inttobyte($color["red"]);
+                       $ret .= inttobyte(0); //RESERVED
                      };
 
-                    $CT=$ColorTotal;
-                  for($p=$ColorTotal;$p<$CC;$p++)
+                    $CT = $ColorTotal;
+                  for ($p = $ColorTotal; $p < $CC; $p++)
                        {
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0); //RESERVED
+                      $ret .= inttobyte(0);
+                      $ret .= inttobyte(0);
+                      $ret .= inttobyte(0);
+                      $ret .= inttobyte(0); //RESERVED
                      };
                    };
 
 
-if($BitCount<=8)
+if ($BitCount <= 8)
 {
 
- for($y=$Height-1;$y>=0;$y--)
+ for ($y = $Height - 1; $y >= 0; $y--)
  {
-  $bWrite="";
-  for($x=0;$x<$Width;$x++)
+  $bWrite = "";
+  for ($x = 0; $x < $Width; $x++)
    {
-   $color=imagecolorat($img,$x,$y);
-   $bWrite.=decbinx($color,$BitCount);
-   if(strlen($bWrite)==8)
+   $color = imagecolorat($img, $x, $y);
+   $bWrite .= decbinx($color, $BitCount);
+   if (strlen($bWrite) == 8)
     {
-     $retd.=inttobyte(bindec($bWrite));
-     $bWrite="";
+     $retd .= inttobyte(bindec($bWrite));
+     $bWrite = "";
     };
    };
 
-  if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
+  if ((strlen($bWrite) < 8) and (strlen($bWrite) != 0))
     {
-     $sl=strlen($bWrite);
-     for($t=0;$t<8-$sl;$t++)
-      $sl.="0";
-     $retd.=inttobyte(bindec($bWrite));
+     $sl = strlen($bWrite);
+     for ($t = 0; $t < 8 - $sl; $t++)
+      $sl .= "0";
+     $retd .= inttobyte(bindec($bWrite));
     };
- for($z=0;$z<$Zbytek;$z++)
-   $retd.=inttobyte(0);
+ for ($z = 0; $z < $Zbytek; $z++)
+   $retd .= inttobyte(0);
  };
 };
 
-if(($RLE==1)and($BitCount==8))
+if (($RLE == 1) and ($BitCount == 8))
 {
- for($t=0;$t<strlen($retd);$t+=4)
+ for ($t = 0; $t < strlen($retd); $t += 4)
   {
-   if($t!=0)
-   if(($t)%$Width==0)
-    $ret.=chr(0).chr(0);
+   if ($t != 0)
+   if (($t) % $Width == 0)
+    $ret .= chr(0).chr(0);
 
-   if(($t+5)%$Width==0)
+   if (($t + 5) % $Width == 0)
    {
-     $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0);
-     $t+=1;
+     $ret .= chr(0).chr(5).substr($retd, $t, 5).chr(0);
+     $t += 1;
    }
-   if(($t+6)%$Width==0)
+   if (($t + 6) % $Width == 0)
     {
-     $ret.=chr(0).chr(6).substr($retd,$t,6);
-     $t+=2;
+     $ret .= chr(0).chr(6).substr($retd, $t, 6);
+     $t += 2;
     }
     else
     {
-     $ret.=chr(0).chr(4).substr($retd,$t,4);
+     $ret .= chr(0).chr(4).substr($retd, $t, 4);
     };
   };
-  $ret.=chr(0).chr(1);
+  $ret .= chr(0).chr(1);
 }
 else
 {
-$ret.=$retd;
+$ret .= $retd;
 };
 
 
-                if($BitCount==24)
+                if ($BitCount == 24)
                 {
-                for($z=0;$z<$Zbytek;$z++)
-                 $Dopl.=chr(0);
+                for ($z = 0; $z < $Zbytek; $z++)
+                 $Dopl .= chr(0);
 
-                for($y=$Height-1;$y>=0;$y--)
+                for ($y = $Height - 1; $y >= 0; $y--)
                  {
-                 for($x=0;$x<$Width;$x++)
+                 for ($x = 0; $x < $Width; $x++)
                         {
-                           $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
-                           $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
+                           $color = imagecolorsforindex($img, ImageColorAt($img, $x, $y));
+                           $ret .= chr($color["blue"]).chr($color["green"]).chr($color["red"]);
                         }
-                 $ret.=$Dopl;
+                 $ret .= $Dopl;
                  };
 
                  };
 
-  if($file!="")
+  if ($file != "")
    {
-    $r=($f=fopen($file,"w"));
-    $r=$r and fwrite($f,$ret);
-    $r=$r and fclose($f);
+    $r = ($f = fopen($file, "w"));
+    $r = $r and fwrite($f, $ret);
+    $r = $r and fclose($f);
     return $r;
    }
   else
@@ -208,58 +208,58 @@ 
 {
 global  $CurrentBit, $echoMode;
 
-$f=fopen($file,"r");
-$Header=fread($f,2);
+$f = fopen($file, "r");
+$Header = fread($f, 2);
 
-if($Header=="BM")
+if ($Header == "BM")
 {
- $Size=freaddword($f);
- $Reserved1=freadword($f);
- $Reserved2=freadword($f);
- $FirstByteOfImage=freaddword($f);
-
- $SizeBITMAPINFOHEADER=freaddword($f);
- $Width=freaddword($f);
- $Height=freaddword($f);
- $biPlanes=freadword($f);
- $biBitCount=freadword($f);
- $RLECompression=freaddword($f);
- $WidthxHeight=freaddword($f);
- $biXPelsPerMeter=freaddword($f);
- $biYPelsPerMeter=freaddword($f);
- $NumberOfPalettesUsed=freaddword($f);
- $NumberOfImportantColors=freaddword($f);
-
-if($biBitCount<24)
+ $Size = freaddword($f);
+ $Reserved1 = freadword($f);
+ $Reserved2 = freadword($f);
+ $FirstByteOfImage = freaddword($f);
+
+ $SizeBITMAPINFOHEADER = freaddword($f);
+ $Width = freaddword($f);
+ $Height = freaddword($f);
+ $biPlanes = freadword($f);
+ $biBitCount = freadword($f);
+ $RLECompression = freaddword($f);
+ $WidthxHeight = freaddword($f);
+ $biXPelsPerMeter = freaddword($f);
+ $biYPelsPerMeter = freaddword($f);
+ $NumberOfPalettesUsed = freaddword($f);
+ $NumberOfImportantColors = freaddword($f);
+
+if ($biBitCount < 24)
  {
-  $img=imagecreate($Width,$Height);
-  $Colors=pow(2,$biBitCount);
-  for($p=0;$p<$Colors;$p++)
+  $img = imagecreate($Width, $Height);
+  $Colors = pow(2, $biBitCount);
+  for ($p = 0; $p < $Colors; $p++)
    {
-    $B=freadbyte($f);
-    $G=freadbyte($f);
-    $R=freadbyte($f);
-    $Reserved=freadbyte($f);
-    $Palette[]=imagecolorallocate($img,$R,$G,$B);
+    $B = freadbyte($f);
+    $G = freadbyte($f);
+    $R = freadbyte($f);
+    $Reserved = freadbyte($f);
+    $Palette[] = imagecolorallocate($img, $R, $G, $B);
    };
 
 
 
 
-if($RLECompression==0)
+if ($RLECompression == 0)
 {
-   $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
+   $Zbytek = (4 - ceil(($Width / (8 / $biBitCount))) % 4) % 4;
 
-for($y=$Height-1;$y>=0;$y--)
+for ($y = $Height - 1; $y >= 0; $y--)
     {
-     $CurrentBit=0;
-     for($x=0;$x<$Width;$x++)
+     $CurrentBit = 0;
+     for ($x = 0; $x < $Width; $x++)
       {
-         $C=freadbits($f,$biBitCount);
-       imagesetpixel($img,$x,$y,$Palette[$C]);
+         $C = freadbits($f, $biBitCount);
+       imagesetpixel($img, $x, $y, $Palette[$C]);
       };
-    if($CurrentBit!=0) {freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
+    if ($CurrentBit != 0) {freadbyte($f); };
+    for ($g = 0; $g < $Zbytek; $g++)
      freadbyte($f);
      };
 
@@ -267,142 +267,142 @@ 
 };
 
 
-if($RLECompression==1) //$BI_RLE8
+if ($RLECompression == 1) //$BI_RLE8
 {
-$y=$Height;
+$y = $Height;
 
-$pocetb=0;
+$pocetb = 0;
 
-while(true)
+while (true)
 {
 $y--;
-$prefix=freadbyte($f);
-$suffix=freadbyte($f);
-$pocetb+=2;
+$prefix = freadbyte($f);
+$suffix = freadbyte($f);
+$pocetb += 2;
 
-$echoit=false;
+$echoit = false;
 
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-if(($prefix==0)and($suffix==1)) break;
-if(feof($f)) break;
+if ($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
+if (($prefix == 0) and ($suffix == 1)) break;
+if (feof($f)) break;
 
-while(!(($prefix==0)and($suffix==0)))
+while (!(($prefix == 0) and ($suffix == 0)))
 {
- if($prefix==0)
+ if ($prefix == 0)
   {
-   $pocet=$suffix;
-   $Data.=fread($f,$pocet);
-   $pocetb+=$pocet;
-   if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+   $pocet = $suffix;
+   $Data .= fread($f, $pocet);
+   $pocetb += $pocet;
+   if ($pocetb % 2 == 1) {freadbyte($f); $pocetb++; };
   };
- if($prefix>0)
+ if ($prefix > 0)
   {
-   $pocet=$prefix;
-   for($r=0;$r<$pocet;$r++)
-    $Data.=chr($suffix);
+   $pocet = $prefix;
+   for ($r = 0; $r < $pocet; $r++)
+    $Data .= chr($suffix);
   };
- $prefix=freadbyte($f);
- $suffix=freadbyte($f);
- $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+ $prefix = freadbyte($f);
+ $suffix = freadbyte($f);
+ $pocetb += 2;
+ if ($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 };
 
-for($x=0;$x<strlen($Data);$x++)
+for ($x = 0; $x < strlen($Data); $x++)
  {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+  imagesetpixel($img, $x, $y, $Palette[ord($Data[$x])]);
  };
-$Data="";
+$Data = "";
 
 };
 
 };
 
 
-if($RLECompression==2) //$BI_RLE4
+if ($RLECompression == 2) //$BI_RLE4
 {
-$y=$Height;
-$pocetb=0;
+$y = $Height;
+$pocetb = 0;
 
 /*while(!feof($f))
  echo freadbyte($f)."_".freadbyte($f)."<BR>";*/
-while(true)
+while (true)
 {
 //break;
 $y--;
-$prefix=freadbyte($f);
-$suffix=freadbyte($f);
-$pocetb+=2;
+$prefix = freadbyte($f);
+$suffix = freadbyte($f);
+$pocetb += 2;
 
-$echoit=false;
+$echoit = false;
 
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-if(($prefix==0)and($suffix==1)) break;
-if(feof($f)) break;
+if ($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
+if (($prefix == 0) and ($suffix == 1)) break;
+if (feof($f)) break;
 
-while(!(($prefix==0)and($suffix==0)))
+while (!(($prefix == 0) and ($suffix == 0)))
 {
- if($prefix==0)
+ if ($prefix == 0)
   {
-   $pocet=$suffix;
-
-   $CurrentBit=0;
-   for($h=0;$h<$pocet;$h++)
-    $Data.=chr(freadbits($f,4));
-   if($CurrentBit!=0) freadbits($f,4);
-   $pocetb+=ceil(($pocet/2));
-   if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+   $pocet = $suffix;
+
+   $CurrentBit = 0;
+   for ($h = 0; $h < $pocet; $h++)
+    $Data .= chr(freadbits($f, 4));
+   if ($CurrentBit != 0) freadbits($f, 4);
+   $pocetb += ceil(($pocet / 2));
+   if ($pocetb % 2 == 1) {freadbyte($f); $pocetb++; };
   };
- if($prefix>0)
+ if ($prefix > 0)
   {
-   $pocet=$prefix;
-   $i=0;
-   for($r=0;$r<$pocet;$r++)
+   $pocet = $prefix;
+   $i = 0;
+   for ($r = 0; $r < $pocet; $r++)
     {
-    if($i%2==0)
+    if ($i % 2 == 0)
      {
-      $Data.=chr($suffix%16);
+      $Data .= chr($suffix % 16);
      }
      else
      {
-      $Data.=chr(floor($suffix/16));
+      $Data .= chr(floor($suffix / 16));
      };
     $i++;
     };
   };
- $prefix=freadbyte($f);
- $suffix=freadbyte($f);
- $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+ $prefix = freadbyte($f);
+ $suffix = freadbyte($f);
+ $pocetb += 2;
+ if ($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 };
 
-for($x=0;$x<strlen($Data);$x++)
+for ($x = 0; $x < strlen($Data); $x++)
  {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+  imagesetpixel($img, $x, $y, $Palette[ord($Data[$x])]);
  };
-$Data="";
+$Data = "";
 
 };
 
 };
 
 
- if($biBitCount==24)
+ if ($biBitCount == 24)
 {
- $img=imagecreatetruecolor($Width,$Height);
- $Zbytek=$Width%4;
+ $img = imagecreatetruecolor($Width, $Height);
+ $Zbytek = $Width % 4;
 
-   for($y=$Height-1;$y>=0;$y--)
+   for ($y = $Height - 1; $y >= 0; $y--)
     {
-     for($x=0;$x<$Width;$x++)
+     for ($x = 0; $x < $Width; $x++)
       {
-       $B=freadbyte($f);
-       $G=freadbyte($f);
-       $R=freadbyte($f);
-       $color=imagecolorexact($img,$R,$G,$B);
-       if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
-       imagesetpixel($img,$x,$y,$color);
+       $B = freadbyte($f);
+       $G = freadbyte($f);
+       $R = freadbyte($f);
+       $color = imagecolorexact($img, $R, $G, $B);
+       if ($color == -1) $color = imagecolorallocate($img, $R, $G, $B);
+       imagesetpixel($img, $x, $y, $color);
       }
-    for($z=0;$z<$Zbytek;$z++)
+    for ($z = 0; $z < $Zbytek; $z++)
      freadbyte($f);
    };
 };
@@ -438,14 +438,14 @@ 
 
 function freadbyte($f)
 {
- return ord(fread($f,1));
+ return ord(fread($f, 1));
 };
 
 function freadword($f)
 {
- $b1=freadbyte($f);
- $b2=freadbyte($f);
- return $b2*256+$b1;
+ $b1 = freadbyte($f);
+ $b2 = freadbyte($f);
+ return $b2 * 256 + $b1;
 };
 
 
@@ -456,48 +456,48 @@ 
 
 function freaddword($f)
 {
- $b1=freadword($f);
- $b2=freadword($f);
- return $b2*65536+$b1;
+ $b1 = freadword($f);
+ $b2 = freadword($f);
+ return $b2 * 65536 + $b1;
 };
 
 
 
-function RetBits($byte,$start,$len)
+function RetBits($byte, $start, $len)
 {
-$bin=decbin8($byte);
-$r=bindec(substr($bin,$start,$len));
+$bin = decbin8($byte);
+$r = bindec(substr($bin, $start, $len));
 return $r;
 
 };
 
 
 
-$CurrentBit=0;
-function freadbits($f,$count)
+$CurrentBit = 0;
+function freadbits($f, $count)
 {
- global $CurrentBit,$SMode;
- $Byte=freadbyte($f);
- $LastCBit=$CurrentBit;
- $CurrentBit+=$count;
- if($CurrentBit==8)
+ global $CurrentBit, $SMode;
+ $Byte = freadbyte($f);
+ $LastCBit = $CurrentBit;
+ $CurrentBit += $count;
+ if ($CurrentBit == 8)
   {
-   $CurrentBit=0;
+   $CurrentBit = 0;
   }
  else
   {
-   fseek($f,ftell($f)-1);
+   fseek($f, ftell($f) - 1);
   };
- return RetBits($Byte,$LastCBit,$count);
+ return RetBits($Byte, $LastCBit, $count);
 };
 
 
 
-function RGBToHex($Red,$Green,$Blue)
+function RGBToHex($Red, $Green, $Blue)
   {
-   $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed";
-   $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen";
-   $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue";
+   $hRed = dechex($Red); if (strlen($hRed) == 1) $hRed = "0$hRed";
+   $hGreen = dechex($Green); if (strlen($hGreen) == 1) $hGreen = "0$hGreen";
+   $hBlue = dechex($Blue); if (strlen($hBlue) == 1) $hBlue = "0$hBlue";
    return($hRed.$hGreen.$hBlue);
   };
 
@@ -513,15 +513,15 @@ 
 
 function decbin8($d)
 {
-return decbinx($d,8);
+return decbinx($d, 8);
 };
 
-function decbinx($d,$n)
+function decbinx($d, $n)
 {
-$bin=decbin($d);
-$sbin=strlen($bin);
-for($j=0;$j<$n-$sbin;$j++)
- $bin="0$bin";
+$bin = decbin($d);
+$sbin = strlen($bin);
+for ($j = 0; $j < $n - $sbin; $j++)
+ $bin = "0$bin";
 return $bin;
 };
 

Braces +129 added lines, -130 removed lines

@@ -36,7 +36,9 @@ 
 $IsTransparent=$Transparent!=-1;
 
 
-if($IsTransparent) $ColorCount--;
+if($IsTransparent) {
+    $ColorCount--;
+}
 
 if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
 if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
@@ -49,7 +51,9 @@ 
 
                 $Zbytek=(4-($Width/(8/$BitCount))%4)%4;
 
-                if($BitCount<24) $palsize=pow(2,$BitCount)*4;
+                if($BitCount<24) {
+                    $palsize=pow(2,$BitCount)*4;
+                }
 
                 $size=(floor($Width/(8/$BitCount))+$Zbytek)*$Height+54;
                 $size+=$palsize;
@@ -76,14 +80,16 @@ 
 
                 $CC=$ColorCount;
                 $sl1=strlen($ret);
-                if($CC==0) $CC=256;
-                if($BitCount<24)
-                   {
+                if($CC==0) {
+                    $CC=256;
+                }
+                if($BitCount<24) {
                     $ColorTotal=imagecolorstotal($img);
-                     if($IsTransparent) $ColorTotal--;
+                     if($IsTransparent) {
+                         $ColorTotal--;
+                     }
 
-                     for($p=0;$p<$ColorTotal;$p++)
-                     {
+                     for($p=0;$p<$ColorTotal;$p++) {
                       $color=imagecolorsforindex($img,$p);
                        $ret.=inttobyte($color["blue"]);
                        $ret.=inttobyte($color["green"]);
@@ -92,8 +98,7 @@ 
                      };
 
                     $CT=$ColorTotal;
-                  for($p=$ColorTotal;$p<$CC;$p++)
-                       {
+                  for($p=$ColorTotal;$p<$CC;$p++) {
                       $ret.=inttobyte(0);
                       $ret.=inttobyte(0);
                       $ret.=inttobyte(0);
@@ -102,75 +107,63 @@ 
                    };
 
 
-if($BitCount<=8)
-{
+if($BitCount<=8) {
 
- for($y=$Height-1;$y>=0;$y--)
- {
+ for($y=$Height-1;$y>=0;$y--) {
   $bWrite="";
-  for($x=0;$x<$Width;$x++)
-   {
+  for($x=0;$x<$Width;$x++) {
    $color=imagecolorat($img,$x,$y);
    $bWrite.=decbinx($color,$BitCount);
-   if(strlen($bWrite)==8)
-    {
+   if(strlen($bWrite)==8) {
      $retd.=inttobyte(bindec($bWrite));
      $bWrite="";
     };
    };
 
-  if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
-    {
+  if((strlen($bWrite)<8)and(strlen($bWrite)!=0)) {
      $sl=strlen($bWrite);
-     for($t=0;$t<8-$sl;$t++)
-      $sl.="0";
+     for($t=0;$t<8-$sl;$t++) {
+           $sl.="0";
+     }
      $retd.=inttobyte(bindec($bWrite));
     };
- for($z=0;$z<$Zbytek;$z++)
-   $retd.=inttobyte(0);
+ for($z=0;$z<$Zbytek;$z++) {
+    $retd.=inttobyte(0);
+ }
  };
 };
 
-if(($RLE==1)and($BitCount==8))
-{
- for($t=0;$t<strlen($retd);$t+=4)
-  {
-   if($t!=0)
-   if(($t)%$Width==0)
+if(($RLE==1)and($BitCount==8)) {
+ for($t=0;$t<strlen($retd);$t+=4) {
+   if($t!=0) {
+      if(($t)%$Width==0)
     $ret.=chr(0).chr(0);
+   }
 
-   if(($t+5)%$Width==0)
-   {
+   if(($t+5)%$Width==0) {
      $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0);
      $t+=1;
    }
-   if(($t+6)%$Width==0)
-    {
+   if(($t+6)%$Width==0) {
      $ret.=chr(0).chr(6).substr($retd,$t,6);
      $t+=2;
-    }
-    else
-    {
+    } else {
      $ret.=chr(0).chr(4).substr($retd,$t,4);
     };
   };
   $ret.=chr(0).chr(1);
-}
-else
-{
+} else {
 $ret.=$retd;
 };
 
 
-                if($BitCount==24)
-                {
-                for($z=0;$z<$Zbytek;$z++)
-                 $Dopl.=chr(0);
+                if($BitCount==24) {
+                for($z=0;$z<$Zbytek;$z++) {
+                                 $Dopl.=chr(0);
+                }
 
-                for($y=$Height-1;$y>=0;$y--)
-                 {
-                 for($x=0;$x<$Width;$x++)
-                        {
+                for($y=$Height-1;$y>=0;$y--) {
+                 for($x=0;$x<$Width;$x++) {
                            $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
                            $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
                         }
@@ -179,15 +172,12 @@ 
 
                  };
 
-  if($file!="")
-   {
+  if($file!="") {
     $r=($f=fopen($file,"w"));
     $r=$r and fwrite($f,$ret);
     $r=$r and fclose($f);
     return $r;
-   }
-  else
-  {
+   } else {
    echo $ret;
   };
 };
@@ -211,8 +201,7 @@ 
 $f=fopen($file,"r");
 $Header=fread($f,2);
 
-if($Header=="BM")
-{
+if($Header=="BM") {
  $Size=freaddword($f);
  $Reserved1=freadword($f);
  $Reserved2=freadword($f);
@@ -230,12 +219,10 @@ 
  $NumberOfPalettesUsed=freaddword($f);
  $NumberOfImportantColors=freaddword($f);
 
-if($biBitCount<24)
- {
+if($biBitCount<24) {
   $img=imagecreate($Width,$Height);
   $Colors=pow(2,$biBitCount);
-  for($p=0;$p<$Colors;$p++)
-   {
+  for($p=0;$p<$Colors;$p++) {
     $B=freadbyte($f);
     $G=freadbyte($f);
     $R=freadbyte($f);
@@ -246,35 +233,34 @@ 
 
 
 
-if($RLECompression==0)
-{
+if($RLECompression==0) {
    $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
 
-for($y=$Height-1;$y>=0;$y--)
-    {
+for($y=$Height-1;$y>=0;$y--) {
      $CurrentBit=0;
-     for($x=0;$x<$Width;$x++)
-      {
+     for($x=0;$x<$Width;$x++) {
          $C=freadbits($f,$biBitCount);
        imagesetpixel($img,$x,$y,$Palette[$C]);
       };
     if($CurrentBit!=0) {freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
-     freadbyte($f);
+    for($g=0;$g<$Zbytek;$g++) {
+         freadbyte($f);
+    }
      };
 
  };
 };
 
 
-if($RLECompression==1) //$BI_RLE8
+if($RLECompression==1) {
+    //$BI_RLE8
 {
 $y=$Height;
+}
 
 $pocetb=0;
 
-while(true)
-{
+while(true) {
 $y--;
 $prefix=freadbyte($f);
 $suffix=freadbyte($f);
@@ -282,33 +268,38 @@ 
 
 $echoit=false;
 
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-if(($prefix==0)and($suffix==1)) break;
-if(feof($f)) break;
+if($echoit) {
+    echo "Prefix: $prefix Suffix: $suffix<BR>";
+}
+if(($prefix==0)and($suffix==1)) {
+    break;
+}
+if(feof($f)) {
+    break;
+}
 
-while(!(($prefix==0)and($suffix==0)))
-{
- if($prefix==0)
-  {
+while(!(($prefix==0)and($suffix==0))) {
+ if($prefix==0) {
    $pocet=$suffix;
    $Data.=fread($f,$pocet);
    $pocetb+=$pocet;
    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
   };
- if($prefix>0)
-  {
+ if($prefix>0) {
    $pocet=$prefix;
-   for($r=0;$r<$pocet;$r++)
-    $Data.=chr($suffix);
+   for($r=0;$r<$pocet;$r++) {
+       $Data.=chr($suffix);
+   }
   };
  $prefix=freadbyte($f);
  $suffix=freadbyte($f);
  $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
-};
+ if($echoit) {
+     echo "Prefix: $prefix Suffix: $suffix<BR>";
+ }
+ };
 
-for($x=0;$x<strlen($Data);$x++)
- {
+for($x=0;$x<strlen($Data);$x++) {
   imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
  };
 $Data="";
@@ -318,15 +309,16 @@ 
 };
 
 
-if($RLECompression==2) //$BI_RLE4
+if($RLECompression==2) {
+    //$BI_RLE4
 {
 $y=$Height;
+}
 $pocetb=0;
 
 /*while(!feof($f))
  echo freadbyte($f)."_".freadbyte($f)."<BR>";*/
-while(true)
-{
+while(true) {
 //break;
 $y--;
 $prefix=freadbyte($f);
@@ -335,35 +327,37 @@ 
 
 $echoit=false;
 
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-if(($prefix==0)and($suffix==1)) break;
-if(feof($f)) break;
+if($echoit) {
+    echo "Prefix: $prefix Suffix: $suffix<BR>";
+}
+if(($prefix==0)and($suffix==1)) {
+    break;
+}
+if(feof($f)) {
+    break;
+}
 
-while(!(($prefix==0)and($suffix==0)))
-{
- if($prefix==0)
-  {
+while(!(($prefix==0)and($suffix==0))) {
+ if($prefix==0) {
    $pocet=$suffix;
 
    $CurrentBit=0;
-   for($h=0;$h<$pocet;$h++)
-    $Data.=chr(freadbits($f,4));
-   if($CurrentBit!=0) freadbits($f,4);
+   for($h=0;$h<$pocet;$h++) {
+       $Data.=chr(freadbits($f,4));
+   }
+   if($CurrentBit!=0) {
+       freadbits($f,4);
+   }
    $pocetb+=ceil(($pocet/2));
    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
   };
- if($prefix>0)
-  {
+ if($prefix>0) {
    $pocet=$prefix;
    $i=0;
-   for($r=0;$r<$pocet;$r++)
-    {
-    if($i%2==0)
-     {
+   for($r=0;$r<$pocet;$r++) {
+    if($i%2==0) {
       $Data.=chr($suffix%16);
-     }
-     else
-     {
+     } else {
       $Data.=chr(floor($suffix/16));
      };
     $i++;
@@ -372,11 +366,12 @@ 
  $prefix=freadbyte($f);
  $suffix=freadbyte($f);
  $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
-};
+ if($echoit) {
+     echo "Prefix: $prefix Suffix: $suffix<BR>";
+ }
+ };
 
-for($x=0;$x<strlen($Data);$x++)
- {
+for($x=0;$x<strlen($Data);$x++) {
   imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
  };
 $Data="";
@@ -386,24 +381,24 @@ 
 };
 
 
- if($biBitCount==24)
-{
+ if($biBitCount==24) {
  $img=imagecreatetruecolor($Width,$Height);
  $Zbytek=$Width%4;
 
-   for($y=$Height-1;$y>=0;$y--)
-    {
-     for($x=0;$x<$Width;$x++)
-      {
+   for($y=$Height-1;$y>=0;$y--) {
+     for($x=0;$x<$Width;$x++) {
        $B=freadbyte($f);
        $G=freadbyte($f);
        $R=freadbyte($f);
        $color=imagecolorexact($img,$R,$G,$B);
-       if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
+       if($color==-1) {
+           $color=imagecolorallocate($img,$R,$G,$B);
+       }
        imagesetpixel($img,$x,$y,$color);
       }
-    for($z=0;$z<$Zbytek;$z++)
-     freadbyte($f);
+    for($z=0;$z<$Zbytek;$z++) {
+         freadbyte($f);
+    }
    };
 };
 return $img;
@@ -480,12 +475,9 @@ 
  $Byte=freadbyte($f);
  $LastCBit=$CurrentBit;
  $CurrentBit+=$count;
- if($CurrentBit==8)
-  {
+ if($CurrentBit==8) {
    $CurrentBit=0;
-  }
- else
-  {
+  } else {
    fseek($f,ftell($f)-1);
   };
  return RetBits($Byte,$LastCBit,$count);
@@ -494,10 +486,16 @@ 
 
 
 function RGBToHex($Red,$Green,$Blue)
-  {
-   $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed";
-   $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen";
-   $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue";
+{
+   $hRed=dechex($Red);if(strlen($hRed)==1) {
+       $hRed="0$hRed";
+   }
+   $hGreen=dechex($Green);if(strlen($hGreen)==1) {
+       $hGreen="0$hGreen";
+   }
+   $hBlue=dechex($Blue);if(strlen($hBlue)==1) {
+       $hBlue="0$hBlue";
+   }
    return($hRed.$hGreen.$hBlue);
   };
 
@@ -520,8 +518,9 @@ 
 {
 $bin=decbin($d);
 $sbin=strlen($bin);
-for($j=0;$j<$n-$sbin;$j++)
+for($j=0;$j<$n-$sbin;$j++) {
  $bin="0$bin";
+}
 return $bin;
 };
 

htdocs/lib2/logic/attribute.class.php

Doc Comments +4 added lines

@@ -23,6 +23,10 @@
         return self::getAttrbutesListArrayInternal($cacheId, false, $firstLetterUppercase);
     }
 
+    /**
+     * @param boolean $bOnlySelectable
+     * @param boolean $firstLetterUppercase
+     */
     public static function getAttrbutesListArrayInternal($cacheId, $bOnlySelectable, $firstLetterUppercase)
     {
         global $opt;

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
                     LEFT JOIN `sys_trans_text` AS `tt2`
                         ON `t2`.`id`=`tt2`.`trans_id`
                         AND `tt2`.`lang`='&1'
-                    WHERE `cache_attrib`.`group_id`='&2'" . $sAddWhereSql . "
+                    WHERE `cache_attrib`.`group_id`='&2'" . $sAddWhereSql."
                     AND NOT IFNULL(`cache_attrib`.`hidden`, 0)=1
                     ORDER BY `cache_attrib`.`group_id` ASC",
                     $opt['template']['locale'],
@@ -116,7 +116,7 @@ 
             }
             while ($rAttr = sql_fetch_assoc($rsAttr)) {
                 if ($firstLetterUppercase) {
-                    $rAttr['name'] = mb_strtoupper(mb_substr($rAttr['name'], 0, 1)) . mb_substr($rAttr['name'], 1);
+                    $rAttr['name'] = mb_strtoupper(mb_substr($rAttr['name'], 0, 1)).mb_substr($rAttr['name'], 1);
                 }
                 $attr[] = $rAttr;
                 if ($rAttr['search_default']) {

htdocs/lib2/logic/cache.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -411,9 +411,9 @@
     }
 
     /**
-     * @param $cacheId
-     * @param $start
-     * @param $count
+     * @param integer $cacheId
+     * @param integer $start
+     * @param integer $count
      * @param bool $deleted
      * @param bool $protect_old_coords
      *

Spacing +11 added lines, -11 removed lines

@@ -8,8 +8,8 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/logtypes.inc.php';
-require_once __DIR__ . '/../../lib/cache.inc.php';
+require_once __DIR__.'/logtypes.inc.php';
+require_once __DIR__.'/../../lib/cache.inc.php';
 
 class cache
 {
@@ -283,7 +283,7 @@ 
         );
         if ($r = sql_fetch_assoc($rs)) {
             if ($r['listing_outdated'] == 2) {
-                $url = 'viewlogs.php?cacheid=' . $this->getCacheId() . '#log' . $r['id'];
+                $url = 'viewlogs.php?cacheid='.$this->getCacheId().'#log'.$r['id'];
             }
         }
         sql_free_result($rs);
@@ -473,7 +473,7 @@ 
                     `cache_logs`.`text` AS `text`,
                     `cache_logs`.`text_html` AS `texthtml`,
                     `cache_logs`.`picture`,
-                    ' . $delfields . ",
+                    ' . $delfields.",
                     `user`.`username` AS `username`,
                     IF(ISNULL(`cache_rating`.`cache_id`), 0, `cache_logs`.`type` IN (1,7)) AS `recommended`
              FROM $table AS `cache_logs`
@@ -483,7 +483,7 @@ 
                  ON `cache_logs`.`cache_id`=`cache_rating`.`cache_id`
                  AND `cache_logs`.`user_id`=`cache_rating`.`user_id`
                  AND `cache_logs`.`date`=`cache_rating`.`rating_date`
-             " . $addjoin . "
+             ".$addjoin."
              WHERE `cache_logs`.`cache_id`='&1'
              ORDER BY `cache_logs`.`order_date` DESC, `cache_logs`.`date_created` DESC, `id` DESC
              LIMIT &2, &3",
@@ -508,7 +508,7 @@ 
             );
             while ($rPicture = sql_fetch_assoc($rsPictures)) {
                 if (trim($rPicture['title']) == '') {
-                    $rPicture['title'] = $translate->t('Picture', '', '', 0) . ' ' . (count($pictures) + 1);
+                    $rPicture['title'] = $translate->t('Picture', '', '', 0).' '.(count($pictures) + 1);
                 }
                 $pictures[] = $rPicture;
             }
@@ -521,7 +521,7 @@ 
                 if (!$newcoord) {
                     $newcoord = $coords[$coordpos];
                 }
-                ++ $coordpos;
+                ++$coordpos;
             }
             if ($newcoord) {
                 $distance = geomath::calcDistance(
@@ -554,7 +554,7 @@ 
             $original = count($coords) - 1;
             $lastlogdate = $logs[count($logs) - 1]['order_date'];
             while ($original > 0 && $coords[$original - 1]['date'] < $lastlogdate) {
-                -- $original;
+                --$original;
             }
             $coord = new coordinate($coords[$original]['latitude'], $coords[$original]['longitude']);
             $logs[] = [
@@ -676,9 +676,9 @@ 
             $login->userid,
             $this->nCacheId,
             0,
-            'Cache ' . sql_escape($this->nCacheId) . ' has changed the owner from userid ' . sql_escape(
+            'Cache '.sql_escape($this->nCacheId).' has changed the owner from userid '.sql_escape(
                 $this->getUserId()
-            ) . ' to ' . sql_escape($userId) . ' by ' . sql_escape($login->userid)
+            ).' to '.sql_escape($userId).' by '.sql_escape($login->userid)
         );
         // Adoptions now are recorded by trigger in cache_adoptions table.
         // Recording adoptions in 'logentries' may be discarded after ensuring that the
@@ -955,7 +955,7 @@ 
             $logTypes[$i]['selected'] = ($logtype == $defaultLogType) ? true : false;
             $logTypes[$i]['name'] = $logtypeNames[$logtype];
             $logTypes[$i]['id'] = $logtype;
-            $i ++;
+            $i++;
         }
 
         // return