arastta / arastta

admin/model/common/update.php

Doc Comments +3 added lines

@@ -235,6 +235,9 @@
         return $data;
     }
 
+    /**
+     * @param string $url
+     */
     public function getRemoteVersion($url)
     {
         $remote_data = \Httpful\Request::get($url)

Indentation +216 added lines, -216 removed lines

@@ -10,292 +10,292 @@
 class ModelCommonUpdate extends Model
 {
 
-    public function check()
-    {
-        // Fire event
-        $this->trigger->fire('pre.admin.update.check');
+	public function check()
+	{
+		// Fire event
+		$this->trigger->fire('pre.admin.update.check');
 
-        $this->cache->remove('addon');
-        $this->cache->remove('update');
-        $this->cache->remove('version');
+		$this->cache->remove('addon');
+		$this->cache->remove('update');
+		$this->cache->remove('version');
 
-        return true;
-    }
+		return true;
+	}
 
-    public function changelog()
-    {
-        $output = '';
+	public function changelog()
+	{
+		$output = '';
 
-        $url = 'https://api.github.com/repos/arastta/arastta/releases';
+		$url = 'https://api.github.com/repos/arastta/arastta/releases';
 
-        $json = \Httpful\Request::get($url)
-            ->send()
-            ->raw_body;
+		$json = \Httpful\Request::get($url)
+			->send()
+			->raw_body;
 
-        if (empty($json)) {
-            return $output;
-        }
+		if (empty($json)) {
+			return $output;
+		}
 
-        $parsedown = new ParsedownExtra();
+		$parsedown = new ParsedownExtra();
 
-        $releases = json_decode($json);
+		$releases = json_decode($json);
 
-        foreach ($releases as $release) {
-            if ($release->tag_name <= VERSION) {
-                continue;
-            }
+		foreach ($releases as $release) {
+			if ($release->tag_name <= VERSION) {
+				continue;
+			}
             
-            if ($release->prerelease == true) {
-                continue;
-            }
+			if ($release->prerelease == true) {
+				continue;
+			}
 
-            if (empty($release->body)) {
-                continue;
-            }
+			if (empty($release->body)) {
+				continue;
+			}
 
-            $output .= '<h2><span class="label label-primary">'.$release->tag_name.'</span></h2>';
+			$output .= '<h2><span class="label label-primary">'.$release->tag_name.'</span></h2>';
 
-            // Parse markdown output
-            $markdown = str_replace('## Changelog', '', $release->body);
+			// Parse markdown output
+			$markdown = str_replace('## Changelog', '', $release->body);
 
-            $output .= $parsedown->text($markdown);
+			$output .= $parsedown->text($markdown);
 
-            $output .= '<hr>';
-        }
+			$output .= '<hr>';
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 
-    // Upgrade
-    public function update()
-    {
-        $version = $this->request->get['version'];
-        $product_id = $this->request->get['product_id'];
+	// Upgrade
+	public function update()
+	{
+		$version = $this->request->get['version'];
+		$product_id = $this->request->get['product_id'];
 
-        if (!$data = $this->downloadUpdate($product_id, $version)) {
-            return false;
-        }
+		if (!$data = $this->downloadUpdate($product_id, $version)) {
+			return false;
+		}
 
-        $path = 'temp-' . md5(mt_rand());
-        $file = DIR_UPLOAD . $path . '/upload.zip';
+		$path = 'temp-' . md5(mt_rand());
+		$file = DIR_UPLOAD . $path . '/upload.zip';
 
-        if (!is_dir(DIR_UPLOAD . $path)) {
-            $this->filesystem->mkdir(DIR_UPLOAD . $path);
-        }
+		if (!is_dir(DIR_UPLOAD . $path)) {
+			$this->filesystem->mkdir(DIR_UPLOAD . $path);
+		}
 
-        $uploaded = is_int(file_put_contents($file, $data)) ? true : false;
+		$uploaded = is_int(file_put_contents($file, $data)) ? true : false;
 
-        if (!$uploaded) {
-            return false;
-        }
+		if (!$uploaded) {
+			return false;
+		}
 
-        // Fire event
-        $this->trigger->fire('pre.admin.update.update', array(&$product_id));
+		// Fire event
+		$this->trigger->fire('pre.admin.update.update', array(&$product_id));
 
-        // Force enable maintenance mode
-        $maintenance_mode = $this->config->get('maintenance_mode');
-        $this->config->set('maintenance_mode', 1);
+		// Force enable maintenance mode
+		$maintenance_mode = $this->config->get('maintenance_mode');
+		$this->config->set('maintenance_mode', 1);
 
-        $installer = new Installer($this->registry);
+		$installer = new Installer($this->registry);
 
-        if (!$installer->unzip($file)) {
-            return false;
-        }
+		if (!$installer->unzip($file)) {
+			return false;
+		}
 
-        // Remove Zip
-        $this->filesystem->remove($file);
+		// Remove Zip
+		$this->filesystem->remove($file);
 
-        if ($product_id == 'core') {
-            $temp_path = DIR_UPLOAD . $path;
-            $install_path = $temp_path . '/install';
+		if ($product_id == 'core') {
+			$temp_path = DIR_UPLOAD . $path;
+			$install_path = $temp_path . '/install';
 
-            // Load the update script, if available
-            if (is_file($install_path.'/update.php')) {
-                require_once($install_path.'/update.php');
-            }
+			// Load the update script, if available
+			if (is_file($install_path.'/update.php')) {
+				require_once($install_path.'/update.php');
+			}
 
-            // Don't copy the install folder
-            $this->filesystem->remove($install_path);
+			// Don't copy the install folder
+			$this->filesystem->remove($install_path);
 
-            // Move all files/folders from temp path
-            try {
-                $this->filesystem->mirror($temp_path, DIR_ROOT, null, array('override' => true));
-            } catch (Exception $e) {
-                return false;
-            }
+			// Move all files/folders from temp path
+			try {
+				$this->filesystem->mirror($temp_path, DIR_ROOT, null, array('override' => true));
+			} catch (Exception $e) {
+				return false;
+			}
 
-            // Delete the temp path
-            $this->filesystem->remove($temp_path);
-        } else {
-            // Required for ftp & remove extension functions
-            $this->request->post['path'] = $path;
+			// Delete the temp path
+			$this->filesystem->remove($temp_path);
+		} else {
+			// Required for ftp & remove extension functions
+			$this->request->post['path'] = $path;
 
-            if ($this->filesystem->exists(DIR_UPLOAD . $path . '/install.json')) {
-                $install_data = json_decode(file_get_contents(DIR_UPLOAD . $path . '/install.json'), true);
+			if ($this->filesystem->exists(DIR_UPLOAD . $path . '/install.json')) {
+				$install_data = json_decode(file_get_contents(DIR_UPLOAD . $path . '/install.json'), true);
 
-                // Set it to use in the next step, addExtensionTheme
-                $this->session->data['product_id'] = $product_id;
-                $this->session->data['installer_info'] = $install_data;
-            }
+				// Set it to use in the next step, addExtensionTheme
+				$this->session->data['product_id'] = $product_id;
+				$this->session->data['installer_info'] = $install_data;
+			}
 
-            $ftp = $this->load->controller('extension/installer/parseFiles');
-            $remove = $this->load->controller('extension/installer/remove');
+			$ftp = $this->load->controller('extension/installer/parseFiles');
+			$remove = $this->load->controller('extension/installer/remove');
 
-            $this->db->query("UPDATE `" . DB_PREFIX . "addon` SET `product_version` = '" . $this->db->escape($version) . "' WHERE `product_id` = '" . (int)$product_id . "'");
-        }
+			$this->db->query("UPDATE `" . DB_PREFIX . "addon` SET `product_version` = '" . $this->db->escape($version) . "' WHERE `product_id` = '" . (int)$product_id . "'");
+		}
 
-        // Restore maintenance mode
-        $this->config->set('maintenance_mode', $maintenance_mode);
+		// Restore maintenance mode
+		$this->config->set('maintenance_mode', $maintenance_mode);
 
-        // Fire event
-        $this->trigger->fire('post.admin.update.update', array(&$product_id));
+		// Fire event
+		$this->trigger->fire('post.admin.update.update', array(&$product_id));
 
-        return true;
-    }
+		return true;
+	}
 
-    public function countUpdates()
-    {
-        return array_sum(array_map("count", $this->getUpdates()));
-    }
+	public function countUpdates()
+	{
+		return array_sum(array_map("count", $this->getUpdates()));
+	}
 
-    public function getUpdates()
-    {
-        $data = $this->cache->get('update');
+	public function getUpdates()
+	{
+		$data = $this->cache->get('update');
 
-        if (empty($data)) {
-            $data = array();
+		if (empty($data)) {
+			$data = array();
 
-            $this->load->model('extension/marketplace');
+			$this->load->model('extension/marketplace');
 
-            $addons = $this->model_extension_marketplace->getAddons(true);
+			$addons = $this->model_extension_marketplace->getAddons(true);
 
-            $versions = $this->getVersions($addons);
+			$versions = $this->getVersions($addons);
 
-            foreach ($versions as $key => $version) {
-                // Addons (extensions, themes, translations) comes as array
-                if (is_array($version)) {
-                    foreach ($version as $id => $addon_version) {
-                        $addon = $addons[$id];
-                        $type = $addon['product_type'];
+			foreach ($versions as $key => $version) {
+				// Addons (extensions, themes, translations) comes as array
+				if (is_array($version)) {
+					foreach ($version as $id => $addon_version) {
+						$addon = $addons[$id];
+						$type = $addon['product_type'];
 
-                        // English (en-GB) language, always up-to-date
-                        if ($addon['product_id'] == 225) {
-                            continue;
-                        }
+						// English (en-GB) language, always up-to-date
+						if ($addon['product_id'] == 225) {
+							continue;
+						}
 
-                        // Up-to-date
-                        if (version_compare($addon['product_version'], $addon_version) == 0) {
-                            continue;
-                        }
+						// Up-to-date
+						if (version_compare($addon['product_version'], $addon_version) == 0) {
+							continue;
+						}
 
-                        $data[$type][$addon['product_id']] = $addon_version;
-                    }
-                } elseif ($key == 'core') {
-                    if (version_compare(VERSION, $version) != 0) {
-                        $data['core'] = $version;
-                    }
-                }
-            }
+						$data[$type][$addon['product_id']] = $addon_version;
+					}
+				} elseif ($key == 'core') {
+					if (version_compare(VERSION, $version) != 0) {
+						$data['core'] = $version;
+					}
+				}
+			}
 
-            $this->cache->set('update', $data);
-        }
+			$this->cache->set('update', $data);
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getVersions($addons = array())
-    {
-        $data = $this->cache->get('version');
+	public function getVersions($addons = array())
+	{
+		$data = $this->cache->get('version');
 
-        if (empty($data)) {
-            $data = array();
-
-            // Check core first
-            $info = $this->utility->getInfo();
-            $base_url = 'http://arastta.io';
+		if (empty($data)) {
+			$data = array();
+
+			// Check core first
+			$info = $this->utility->getInfo();
+			$base_url = 'http://arastta.io';
 
-            $url = $base_url.'/core/1.0/version/'.$info['arastta'].'/'.$info['php'].'/'.$info['mysql'].'/'.$info['langs'].'/'.$info['stores'];
+			$url = $base_url.'/core/1.0/version/'.$info['arastta'].'/'.$info['php'].'/'.$info['mysql'].'/'.$info['langs'].'/'.$info['stores'];
 
-            $data['core'] = $this->getRemoteVersion($url);
-
-            // Then addons
-            if (!empty($addons)) {
-                foreach ($addons as $addon) {
-                    $type = $addon['product_type'];
+			$data['core'] = $this->getRemoteVersion($url);
+
+			// Then addons
+			if (!empty($addons)) {
+				foreach ($addons as $addon) {
+					$type = $addon['product_type'];
 
-                    $url = $base_url.'/'.$type.'/1.0/version/'.$addon['product_id'].'/'.$addon['product_version'].'/'.$info['arastta'];
+					$url = $base_url.'/'.$type.'/1.0/version/'.$addon['product_id'].'/'.$addon['product_version'].'/'.$info['arastta'];
 
-                    $data[$type][$addon['product_id']] = $this->getRemoteVersion($url);
-                }
-            }
+					$data[$type][$addon['product_id']] = $this->getRemoteVersion($url);
+				}
+			}
 
-            $this->cache->set('version', $data);
-        }
+			$this->cache->set('version', $data);
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 
-    public function getRemoteVersion($url)
-    {
-        $remote_data = \Httpful\Request::get($url)
-            ->addOnCurlOption(CURLOPT_REFERER, $this->url->getDomain())
-            ->send()
-            ->raw_body;
+	public function getRemoteVersion($url)
+	{
+		$remote_data = \Httpful\Request::get($url)
+			->addOnCurlOption(CURLOPT_REFERER, $this->url->getDomain())
+			->send()
+			->raw_body;
 
-        if (is_string($remote_data)) {
-            $version = json_decode($remote_data);
+		if (is_string($remote_data)) {
+			$version = json_decode($remote_data);
 
-            if (is_object($version)) {
-                $latest = $version->latest;
-            } else {
-                $latest = '0.0.0';
-            }
-        } else {
-            $latest = '0.0.0';
-        }
-
-        return $latest;
-    }
+			if (is_object($version)) {
+				$latest = $version->latest;
+			} else {
+				$latest = '0.0.0';
+			}
+		} else {
+			$latest = '0.0.0';
+		}
+
+		return $latest;
+	}
 
-    public function downloadUpdate($product_id, $version)
-    {
-        // Check core first
-        $info = $this->utility->getInfo();
-        $base_url = 'http://arastta.io';
+	public function downloadUpdate($product_id, $version)
+	{
+		// Check core first
+		$info = $this->utility->getInfo();
+		$base_url = 'http://arastta.io';
 
-        if ($product_id == 'core') {
-            $url = $base_url.'/core/1.0/update/'.$version.'/'.$info['php'].'/'.$info['mysql'];
-        } else {
-            $this->load->model('extension/marketplace');
-
-            $addons = $this->model_extension_marketplace->getAddons(true);
+		if ($product_id == 'core') {
+			$url = $base_url.'/core/1.0/update/'.$version.'/'.$info['php'].'/'.$info['mysql'];
+		} else {
+			$this->load->model('extension/marketplace');
+
+			$addons = $this->model_extension_marketplace->getAddons(true);
             
-            $type = $addons[$product_id]['product_type'];
+			$type = $addons[$product_id]['product_type'];
 
-            $url = $base_url.'/'.$type.'/1.0/update/'.$product_id.'/'.$version.'/'.$info['arastta'].'/'.$info['api'];
-        }
+			$url = $base_url.'/'.$type.'/1.0/update/'.$product_id.'/'.$version.'/'.$info['arastta'].'/'.$info['api'];
+		}
 
-        $file = \Httpful\Request::get($url)
-            ->timeout(30)
-            ->addOnCurlOption(CURLOPT_REFERER, $this->url->getDomain())
-            ->send()
-            ->raw_body;
+		$file = \Httpful\Request::get($url)
+			->timeout(30)
+			->addOnCurlOption(CURLOPT_REFERER, $this->url->getDomain())
+			->send()
+			->raw_body;
 
-        return $file;
-    }
+		return $file;
+	}
 
-    public function showColums($table)
-    {
-        $result = array();
+	public function showColums($table)
+	{
+		$result = array();
 
-        $query = $this->db->query("SHOW COLUMNS FROM `" . DB_PREFIX . $table . "`");
+		$query = $this->db->query("SHOW COLUMNS FROM `" . DB_PREFIX . $table . "`");
 
-        if ($query->num_rows) {
-            foreach ($query->rows as $row) {
-                $result[] = $row['Field'];
-            }
-        }
+		if ($query->num_rows) {
+			foreach ($query->rows as $row) {
+				$result[] = $row['Field'];
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

system/engine/loader.php

Indentation +104 added lines, -104 removed lines

@@ -9,152 +9,152 @@
 
 final class Loader {
 
-    private $registry;
+	private $registry;
 
-    public function __construct($registry) {
-        $this->registry = $registry;
-    }
+	public function __construct($registry) {
+		$this->registry = $registry;
+	}
 
-    public function __get($key) {
-        return $this->registry->get($key);
-    }
+	public function __get($key) {
+		return $this->registry->get($key);
+	}
 
-    public function __set($key, $value) {
-        $this->registry->set($key, $value);
-    }
+	public function __set($key, $value) {
+		$this->registry->set($key, $value);
+	}
 
-    public function controller($route, $args = array()) {
-        $this->trigger->fire('pre.load.controller', array(&$route, &$args));
+	public function controller($route, $args = array()) {
+		$this->trigger->fire('pre.load.controller', array(&$route, &$args));
 
-        $action = new Action($route, $args);
+		$action = new Action($route, $args);
 
-        $ret = $action->execute($this->registry);
+		$ret = $action->execute($this->registry);
 
-        $this->trigger->fire('post.load.controller', array(&$route, &$ret));
+		$this->trigger->fire('post.load.controller', array(&$route, &$ret));
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    public function model($model) {
-        // Create model name
-        $model_name = 'model_' . str_replace('/', '_', $model);
+	public function model($model) {
+		// Create model name
+		$model_name = 'model_' . str_replace('/', '_', $model);
         
-        // Return model instance if already created
-        if ($this->registry->get($model_name) !== null) {
-            return $this->registry->get($model_name);
-        }
+		// Return model instance if already created
+		if ($this->registry->get($model_name) !== null) {
+			return $this->registry->get($model_name);
+		}
         
-        $file = Client::getDir() . 'model/' . $model . '.php';
-        $class = 'Model' . preg_replace('/[^a-zA-Z0-9]/', '', $model);
+		$file = Client::getDir() . 'model/' . $model . '.php';
+		$class = 'Model' . preg_replace('/[^a-zA-Z0-9]/', '', $model);
 
-        if (file_exists($file)) {
-            $this->trigger->fire('pre.load.model', array(&$model));
+		if (file_exists($file)) {
+			$this->trigger->fire('pre.load.model', array(&$model));
 
-            include_once($file);
+			include_once($file);
 
-            $model_class = new $class($this->registry);
+			$model_class = new $class($this->registry);
 
-            $this->registry->set($model_name, $model_class);
+			$this->registry->set($model_name, $model_class);
 
-            $this->trigger->fire('post.load.model', array(&$model_class));
-        } else {
-            trigger_error('Error: Could not load model ' . $file . '!');
-            exit();
-        }
-    }
+			$this->trigger->fire('post.load.model', array(&$model_class));
+		} else {
+			trigger_error('Error: Could not load model ' . $file . '!');
+			exit();
+		}
+	}
 
-    public function view($template, $data = array()) {
-        $theme_dir = Client::isCatalog() ? 'theme' : 'template';
+	public function view($template, $data = array()) {
+		$theme_dir = Client::isCatalog() ? 'theme' : 'template';
         
-        if (Client::isAdmin() && isset($this->session->data['theme']) && $this->session->data['theme'] != 'advanced') {
-            if (file_exists(Client::getDir() . 'view/theme/' . $this->session->data['theme'] . '/template/' . $template)) {
-                $theme_dir = 'theme/' . $this->session->data['theme'] . '/template';
-            }
-        }
+		if (Client::isAdmin() && isset($this->session->data['theme']) && $this->session->data['theme'] != 'advanced') {
+			if (file_exists(Client::getDir() . 'view/theme/' . $this->session->data['theme'] . '/template/' . $template)) {
+				$theme_dir = 'theme/' . $this->session->data['theme'] . '/template';
+			}
+		}
 
-        $file = Client::getDir() . 'view/' . $theme_dir . '/' . $template;
+		$file = Client::getDir() . 'view/' . $theme_dir . '/' . $template;
 
-        if (file_exists($file)) {
-            $this->trigger->fire('pre.load.view', array(&$template, &$data));
+		if (file_exists($file)) {
+			$this->trigger->fire('pre.load.view', array(&$template, &$data));
 
-            extract($data);
+			extract($data);
 
-            ob_start();
+			ob_start();
 
-            require($file);
+			require($file);
 
-            $output = ob_get_contents();
+			$output = ob_get_contents();
 
-            ob_end_clean();
+			ob_end_clean();
 
-            $this->trigger->fire('post.load.view', array(&$output, $template));
+			$this->trigger->fire('post.load.view', array(&$output, $template));
 
-            return $output;
-        } else {
-            trigger_error('Error: Could not load template ' . $file . '!');
-            exit();
-        }
-    }
+			return $output;
+		} else {
+			trigger_error('Error: Could not load template ' . $file . '!');
+			exit();
+		}
+	}
 
-    public function output($file, $data) {
-        if (Client::isAdmin()) {
-            $output = $this->view($file.'.tpl', $data);
-        } else {
-            if (file_exists(Client::getDir() . 'view/theme/'. $this->config->get('config_template') . '/template/'.$file.'.tpl')) {
-                $output = $this->view($this->config->get('config_template') . '/template/'.$file.'.tpl', $data);
-            } else {
-                $output = $this->view('default/template/'.$file.'.tpl', $data);
-            }
-        }
+	public function output($file, $data) {
+		if (Client::isAdmin()) {
+			$output = $this->view($file.'.tpl', $data);
+		} else {
+			if (file_exists(Client::getDir() . 'view/theme/'. $this->config->get('config_template') . '/template/'.$file.'.tpl')) {
+				$output = $this->view($this->config->get('config_template') . '/template/'.$file.'.tpl', $data);
+			} else {
+				$output = $this->view('default/template/'.$file.'.tpl', $data);
+			}
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 
-    public function library($library) {
-        $file = DIR_SYSTEM . 'library/' . $library . '.php';
+	public function library($library) {
+		$file = DIR_SYSTEM . 'library/' . $library . '.php';
 
-        if (file_exists($file)) {
-            $this->trigger->fire('pre.load.library', array(&$library));
+		if (file_exists($file)) {
+			$this->trigger->fire('pre.load.library', array(&$library));
 
-            include_once($file);
+			include_once($file);
 
-            $this->trigger->fire('post.load.library', array(&$library));
-        } else {
-            trigger_error('Error: Could not load library ' . $file . '!');
-            exit();
-        }
-    }
+			$this->trigger->fire('post.load.library', array(&$library));
+		} else {
+			trigger_error('Error: Could not load library ' . $file . '!');
+			exit();
+		}
+	}
 
-    public function helper($helper) {
-        $file = DIR_SYSTEM . 'helper/' . $helper . '.php';
+	public function helper($helper) {
+		$file = DIR_SYSTEM . 'helper/' . $helper . '.php';
 
-        if (file_exists($file)) {
-            $this->trigger->fire('pre.load.helper', array(&$helper));
+		if (file_exists($file)) {
+			$this->trigger->fire('pre.load.helper', array(&$helper));
 
-            include_once($file);
+			include_once($file);
 
-            $this->trigger->fire('post.load.helper', array(&$helper));
-        } else {
-            trigger_error('Error: Could not load helper ' . $file . '!');
-            exit();
-        }
-    }
+			$this->trigger->fire('post.load.helper', array(&$helper));
+		} else {
+			trigger_error('Error: Could not load helper ' . $file . '!');
+			exit();
+		}
+	}
 
-    public function config($config) {
-        $this->trigger->fire('pre.load.config', array(&$config));
+	public function config($config) {
+		$this->trigger->fire('pre.load.config', array(&$config));
 
-        $this->registry->get('config')->load($config);
+		$this->registry->get('config')->load($config);
 
-        $this->trigger->fire('post.load.config', array(&$config));
-    }
+		$this->trigger->fire('post.load.config', array(&$config));
+	}
 
-    public function language($language) {
-        $this->trigger->fire('pre.load.language', array(&$language));
+	public function language($language) {
+		$this->trigger->fire('pre.load.language', array(&$language));
 
-        $lang = $this->registry->get('language')->load($language);
+		$lang = $this->registry->get('language')->load($language);
 
-        $this->trigger->fire('post.load.language', array(&$language));
+		$this->trigger->fire('post.load.language', array(&$language));
 
-        return $lang;
-    }
+		return $lang;
+	}
 }

system/library/version.php

Indentation +72 added lines, -72 removed lines

@@ -17,76 +17,76 @@
 final class Version extends Object
 {
 
-    protected $name = 'Arastta';
-
-    protected $code = 'Tianjin';
-
-    protected $major = '1';
-
-    protected $minor = '6';
-
-    protected $patch = '0';
-
-    protected $build = '';
-
-    protected $status = 'RC 2';
-
-    protected $date = '06-April-2017';
-
-    protected $time = '20:00';
-
-    protected $zone = 'GMT +3';
-
-    /**
-     * Compares two a "PHP standardized" version number against the current Arastta version.
-     *
-     * @param   string  $minimum  The minimum version of the Arastta which is compatible.
-     *
-     * @return  bool    True if the version is compatible.
-     *
-     * @see     http://www.php.net/version_compare
-     * @since   1.0
-     */
-    public function isCompatible($minimum)
-    {
-        return version_compare($this->getShortVersion(), $minimum, 'ge');
-    }
-
-    /**
-     * Gets a "PHP standardized" version string for the current Arastta.
-     *
-     * @return  string  Version string.
-     *
-     * @since   1.0
-     */
-    public function getReleaseVersion()
-    {
-        return $this->get('major') . '.' . $this->get('minor');
-    }
-
-    /**
-     * Gets a "PHP standardized" version string for the current Arastta.
-     *
-     * @return  string  Version string.
-     *
-     * @since   1.0
-     */
-    public function getShortVersion()
-    {
-        return $this->getReleaseVersion() . '.' . $this->get('patch');
-    }
-
-    /**
-     * Gets a version string for the current Arastta with all release information.
-     *
-     * @return  string  Complete version string.
-     *
-     * @since   1.0
-     */
-    public function getLongVersion()
-    {
-        return $this->get('name') . ' ' . $this->getShortVersion() . ' '
-        . $this->get('status') . ' [ ' . $this->get('code') . ' ] ' . $this->get('date') . ' '
-        . $this->get('time') . ' ' . $this->get('zone');
-    }
+	protected $name = 'Arastta';
+
+	protected $code = 'Tianjin';
+
+	protected $major = '1';
+
+	protected $minor = '6';
+
+	protected $patch = '0';
+
+	protected $build = '';
+
+	protected $status = 'RC 2';
+
+	protected $date = '06-April-2017';
+
+	protected $time = '20:00';
+
+	protected $zone = 'GMT +3';
+
+	/**
+	 * Compares two a "PHP standardized" version number against the current Arastta version.
+	 *
+	 * @param   string  $minimum  The minimum version of the Arastta which is compatible.
+	 *
+	 * @return  bool    True if the version is compatible.
+	 *
+	 * @see     http://www.php.net/version_compare
+	 * @since   1.0
+	 */
+	public function isCompatible($minimum)
+	{
+		return version_compare($this->getShortVersion(), $minimum, 'ge');
+	}
+
+	/**
+	 * Gets a "PHP standardized" version string for the current Arastta.
+	 *
+	 * @return  string  Version string.
+	 *
+	 * @since   1.0
+	 */
+	public function getReleaseVersion()
+	{
+		return $this->get('major') . '.' . $this->get('minor');
+	}
+
+	/**
+	 * Gets a "PHP standardized" version string for the current Arastta.
+	 *
+	 * @return  string  Version string.
+	 *
+	 * @since   1.0
+	 */
+	public function getShortVersion()
+	{
+		return $this->getReleaseVersion() . '.' . $this->get('patch');
+	}
+
+	/**
+	 * Gets a version string for the current Arastta with all release information.
+	 *
+	 * @return  string  Complete version string.
+	 *
+	 * @since   1.0
+	 */
+	public function getLongVersion()
+	{
+		return $this->get('name') . ' ' . $this->getShortVersion() . ' '
+		. $this->get('status') . ' [ ' . $this->get('code') . ' ] ' . $this->get('date') . ' '
+		. $this->get('time') . ' ' . $this->get('zone');
+	}
 }

system/library/user.php

Indentation +166 added lines, -166 removed lines

@@ -9,170 +9,170 @@
 
 class User extends Object {
 
-    protected $user_id;
-    protected $username;
-    protected $firstname;
-    protected $lastname;
-    protected $email;
-    protected $user_group_id;
-    protected $theme;
-    protected $params;
-    protected $permission = array();
-
-    protected $db;
-    protected $config;
-    protected $request;
-    protected $session;
-    protected $response;
-
-    public function __construct($registry) {
-        $this->db = $registry->get('db');
-        $this->config = $registry->get('config');
-        $this->request = $registry->get('request');
-        $this->session = $registry->get('session');
-        $this->response = $registry->get('response');
-
-        if (isset($this->session->data['user_id'])) {
-            $user_query = $this->db->query("SELECT * FROM " . DB_PREFIX . "user WHERE user_id = '" . (int)$this->session->data['user_id'] . "' AND status = '1'");
-
-            if ($user_query->num_rows) {
-                $this->user_id = $user_query->row['user_id'];
-                $this->username = $user_query->row['username'];
-                $this->firstname = $user_query->row['firstname'];
-                $this->lastname = $user_query->row['lastname'];
-                $this->email = $user_query->row['email'];
-                $this->user_group_id = $user_query->row['user_group_id'];
-
-                $params = json_decode($user_query->row['params'], true);
-
-                if (!isset($this->session->data['theme'])) {
-                    $this->session->data['theme'] = !empty($params['theme']) ? $params['theme'] : 'basic';
-                }
-
-                $this->theme = !empty($params['theme']) ? $params['theme'] : 'basic';
-                $this->params = $params;
-
-                $this->db->query("UPDATE " . DB_PREFIX . "user SET ip = '" . $this->db->escape($this->request->server['REMOTE_ADDR']) . "' WHERE user_id = '" . (int)$this->session->data['user_id'] . "'");
-
-                $user_group_query = $this->db->query("SELECT permission FROM " . DB_PREFIX . "user_group WHERE user_group_id = '" . (int)$user_query->row['user_group_id'] . "'");
-
-                $permissions = unserialize($user_group_query->row['permission']);
-
-                if (is_array($permissions)) {
-                    foreach ($permissions as $key => $value) {
-                        $this->permission[$key] = $value;
-                    }
-                }
-            } else {
-                $this->logout();
-            }
-        }
-    }
-
-    public function login($email, $password) {
-        $user_query = $this->db->query("SELECT * FROM " . DB_PREFIX . "user WHERE email = '" . $this->db->escape($email) . "' AND (password = SHA1(CONCAT(salt, SHA1(CONCAT(salt, SHA1('" . $this->db->escape($password) . "'))))) OR password = '" . $this->db->escape(md5($password)) . "') AND status = '1'");
-
-        if ($user_query->num_rows) {
-            $this->session->data['user_id'] = $user_query->row['user_id'];
-
-            $params = json_decode($user_query->row['params'], true);
-
-            $this->session->data['theme'] = !empty($params['theme']) ? $params['theme'] : 'basic';
-            $this->session->data['admin_language'] = !empty($params['language']) ? $params['language'] : $this->config->get('config_admin_language');
-
-            $this->user_id = $user_query->row['user_id'];
-            $this->username = $user_query->row['username'];
-            $this->firstname = $user_query->row['firstname'];
-            $this->lastname = $user_query->row['lastname'];
-            $this->email = $user_query->row['email'];
-            $this->user_group_id = $user_query->row['user_group_id'];
-            $this->theme = !empty($params['theme']) ? $params['theme'] : 'basic';
-            $this->params = $params;
-
-            $user_group_query = $this->db->query("SELECT permission FROM " . DB_PREFIX . "user_group WHERE user_group_id = '" . (int)$user_query->row['user_group_id'] . "'");
-
-            $permissions = unserialize($user_group_query->row['permission']);
-
-            if (is_array($permissions)) {
-                foreach ($permissions as $key => $value) {
-                    $this->permission[$key] = $value;
-                }
-            }
-
-            // Log this login action
-            $name = $user_query->row['firstname'] . ' ' . $user_query->row['lastname'];
-            $activity_data = array('name' => $name, 'email' => $user_query->row['email'], 'user_group_id' => $user_query->row['user_group_id']);
-
-            $this->db->query("INSERT INTO `" . DB_PREFIX . "user_activity` SET `user_id` = '" . (int)$this->user_id . "', `key` = 'login', `data` = '" . $this->db->escape(json_encode($activity_data)) . "', `ip` = '" . $this->db->escape($this->request->server['REMOTE_ADDR']) . "', `date_added` = NOW()");
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function logout() {
-        unset($this->session->data['user_id']);
-        unset($this->session->data['theme']);
-
-        $this->user_id = '';
-        $this->username = '';
-        $this->firstname = '';
-        $this->lastname = '';
-        $this->email = '';
-        $this->theme = '';
-        $this->params = '';
-    }
-
-    public function hasPermission($key, $value) {
-        if (isset($this->permission[$key])) {
-            return in_array($value, $this->permission[$key]);
-        } else {
-            return false;
-        }
-    }
-
-    public function validate($action = 'modify', $route = '') {
-        if (empty($route) && isset($this->request->get['route'])) {
-            $route = $this->request->get['route'];
-        }
-
-        return $this->user->hasPermission($action, $route);
-    }
-
-    public function isLogged() {
-        return $this->user_id;
-    }
-
-    public function getId() {
-        return $this->user_id;
-    }
-
-    public function getUsername() {
-        return $this->username;
-    }
-
-    public function getFirstName() {
-        return $this->firstname;
-    }
-
-    public function getLastName() {
-        return $this->lastname;
-    }
-
-    public function getEmail() {
-        return $this->email;
-    }
-
-    public function getGroupId() {
-        return $this->user_group_id;
-    }
-
-    public function getTheme() {
-        return $this->theme;
-    }
-
-    public function getParams() {
-        return $this->params;
-    }
+	protected $user_id;
+	protected $username;
+	protected $firstname;
+	protected $lastname;
+	protected $email;
+	protected $user_group_id;
+	protected $theme;
+	protected $params;
+	protected $permission = array();
+
+	protected $db;
+	protected $config;
+	protected $request;
+	protected $session;
+	protected $response;
+
+	public function __construct($registry) {
+		$this->db = $registry->get('db');
+		$this->config = $registry->get('config');
+		$this->request = $registry->get('request');
+		$this->session = $registry->get('session');
+		$this->response = $registry->get('response');
+
+		if (isset($this->session->data['user_id'])) {
+			$user_query = $this->db->query("SELECT * FROM " . DB_PREFIX . "user WHERE user_id = '" . (int)$this->session->data['user_id'] . "' AND status = '1'");
+
+			if ($user_query->num_rows) {
+				$this->user_id = $user_query->row['user_id'];
+				$this->username = $user_query->row['username'];
+				$this->firstname = $user_query->row['firstname'];
+				$this->lastname = $user_query->row['lastname'];
+				$this->email = $user_query->row['email'];
+				$this->user_group_id = $user_query->row['user_group_id'];
+
+				$params = json_decode($user_query->row['params'], true);
+
+				if (!isset($this->session->data['theme'])) {
+					$this->session->data['theme'] = !empty($params['theme']) ? $params['theme'] : 'basic';
+				}
+
+				$this->theme = !empty($params['theme']) ? $params['theme'] : 'basic';
+				$this->params = $params;
+
+				$this->db->query("UPDATE " . DB_PREFIX . "user SET ip = '" . $this->db->escape($this->request->server['REMOTE_ADDR']) . "' WHERE user_id = '" . (int)$this->session->data['user_id'] . "'");
+
+				$user_group_query = $this->db->query("SELECT permission FROM " . DB_PREFIX . "user_group WHERE user_group_id = '" . (int)$user_query->row['user_group_id'] . "'");
+
+				$permissions = unserialize($user_group_query->row['permission']);
+
+				if (is_array($permissions)) {
+					foreach ($permissions as $key => $value) {
+						$this->permission[$key] = $value;
+					}
+				}
+			} else {
+				$this->logout();
+			}
+		}
+	}
+
+	public function login($email, $password) {
+		$user_query = $this->db->query("SELECT * FROM " . DB_PREFIX . "user WHERE email = '" . $this->db->escape($email) . "' AND (password = SHA1(CONCAT(salt, SHA1(CONCAT(salt, SHA1('" . $this->db->escape($password) . "'))))) OR password = '" . $this->db->escape(md5($password)) . "') AND status = '1'");
+
+		if ($user_query->num_rows) {
+			$this->session->data['user_id'] = $user_query->row['user_id'];
+
+			$params = json_decode($user_query->row['params'], true);
+
+			$this->session->data['theme'] = !empty($params['theme']) ? $params['theme'] : 'basic';
+			$this->session->data['admin_language'] = !empty($params['language']) ? $params['language'] : $this->config->get('config_admin_language');
+
+			$this->user_id = $user_query->row['user_id'];
+			$this->username = $user_query->row['username'];
+			$this->firstname = $user_query->row['firstname'];
+			$this->lastname = $user_query->row['lastname'];
+			$this->email = $user_query->row['email'];
+			$this->user_group_id = $user_query->row['user_group_id'];
+			$this->theme = !empty($params['theme']) ? $params['theme'] : 'basic';
+			$this->params = $params;
+
+			$user_group_query = $this->db->query("SELECT permission FROM " . DB_PREFIX . "user_group WHERE user_group_id = '" . (int)$user_query->row['user_group_id'] . "'");
+
+			$permissions = unserialize($user_group_query->row['permission']);
+
+			if (is_array($permissions)) {
+				foreach ($permissions as $key => $value) {
+					$this->permission[$key] = $value;
+				}
+			}
+
+			// Log this login action
+			$name = $user_query->row['firstname'] . ' ' . $user_query->row['lastname'];
+			$activity_data = array('name' => $name, 'email' => $user_query->row['email'], 'user_group_id' => $user_query->row['user_group_id']);
+
+			$this->db->query("INSERT INTO `" . DB_PREFIX . "user_activity` SET `user_id` = '" . (int)$this->user_id . "', `key` = 'login', `data` = '" . $this->db->escape(json_encode($activity_data)) . "', `ip` = '" . $this->db->escape($this->request->server['REMOTE_ADDR']) . "', `date_added` = NOW()");
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public function logout() {
+		unset($this->session->data['user_id']);
+		unset($this->session->data['theme']);
+
+		$this->user_id = '';
+		$this->username = '';
+		$this->firstname = '';
+		$this->lastname = '';
+		$this->email = '';
+		$this->theme = '';
+		$this->params = '';
+	}
+
+	public function hasPermission($key, $value) {
+		if (isset($this->permission[$key])) {
+			return in_array($value, $this->permission[$key]);
+		} else {
+			return false;
+		}
+	}
+
+	public function validate($action = 'modify', $route = '') {
+		if (empty($route) && isset($this->request->get['route'])) {
+			$route = $this->request->get['route'];
+		}
+
+		return $this->user->hasPermission($action, $route);
+	}
+
+	public function isLogged() {
+		return $this->user_id;
+	}
+
+	public function getId() {
+		return $this->user_id;
+	}
+
+	public function getUsername() {
+		return $this->username;
+	}
+
+	public function getFirstName() {
+		return $this->firstname;
+	}
+
+	public function getLastName() {
+		return $this->lastname;
+	}
+
+	public function getEmail() {
+		return $this->email;
+	}
+
+	public function getGroupId() {
+		return $this->user_group_id;
+	}
+
+	public function getTheme() {
+		return $this->theme;
+	}
+
+	public function getParams() {
+		return $this->params;
+	}
 }

system/library/route.php

Indentation +477 added lines, -477 removed lines

@@ -10,488 +10,488 @@
 class Route extends Object
 {
 
-    protected $registry;
-
-    public function __construct($registry)
-    {
-        $this->registry = $registry;
-    }
-
-    public function __get($key)
-    {
-        return $this->registry->get($key);
-    }
-
-    public function __set($key, $value)
-    {
-        $this->registry->set($key, $value);
-    }
-
-    public function parse()
-    {
-        // Stop if SEO is disabled
-        if (!$this->config->get('config_seo_url')) {
-            return;
-        }
-
-        // Attach the URL builder
-        $this->url->addRewrite($this);
-
-        $query_string = $this->uri->getQuery();
-
-        $route = str_replace($this->url->getFullUrl(), '', rawurldecode($this->uri->toString()));
-        $route = str_replace('?'.$query_string, '', $route);
-
-        // www Redirection
-        if ($this->config->get('config_seo_www_red')) {
-            $this->checkWwwRedirection();
-        }
-
-        // Don't parse if home page
-        if (empty($route)) {
-            $this->request->get['route'] = 'common/home';
-
-            return;
-        }
-
-        // Don't parse if route is already set
-        if (!empty($this->request->get['route'])) {
-            // non-SEO to SEO URLs Redirection
-            if ($this->config->get('config_seo_nonseo_red')) {
-                $this->checkNonseoRedirection($this->request->get['route']);
-            }
-
-            return;
-        }
-
-        // non-SEO variables
-        if (!empty($query_string)) {
-            $query_array = $this->uri->getQuery(true);
-            $this->parseNonSeoVariables($query_array);
-
-            if ($this->config->get('config_seo_canonical')) {
-                $canonical_link = htmlspecialchars($this->url->getDomain().$route);
-
-                $this->document->addLink($canonical_link, 'canonical');
-            }
-        }
-
-        $seo_url = str_replace('index.php', '', $route);
-        $seo_url = ltrim($seo_url, '/');
-
-        // Add language code to URL
-        $is_lang_home = false;
-        if ($this->config->get('config_seo_lang_code')) {
-            if ($seo_url == $this->session->data['language']) {
-                $is_lang_home = true;
-            }
-
-            $seo_url = ltrim($seo_url, $this->session->data['language']);
-            $seo_url = ltrim($seo_url, '/');
-        }
-
-        // URLs are stored without suffix in database
-        if ($this->config->get('config_seo_suffix')) {
-            $seo_url = substr($seo_url, 0, -5);
-        }
-
-        $parts = explode('/', $seo_url);
-
-        // remove any empty arrays from trailing
-        if (utf8_strlen(end($parts)) == 0) {
-            array_pop($parts);
-        }
-
-        $seo = new Seo($this->registry);
+	protected $registry;
+
+	public function __construct($registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function __get($key)
+	{
+		return $this->registry->get($key);
+	}
+
+	public function __set($key, $value)
+	{
+		$this->registry->set($key, $value);
+	}
+
+	public function parse()
+	{
+		// Stop if SEO is disabled
+		if (!$this->config->get('config_seo_url')) {
+			return;
+		}
+
+		// Attach the URL builder
+		$this->url->addRewrite($this);
+
+		$query_string = $this->uri->getQuery();
+
+		$route = str_replace($this->url->getFullUrl(), '', rawurldecode($this->uri->toString()));
+		$route = str_replace('?'.$query_string, '', $route);
+
+		// www Redirection
+		if ($this->config->get('config_seo_www_red')) {
+			$this->checkWwwRedirection();
+		}
+
+		// Don't parse if home page
+		if (empty($route)) {
+			$this->request->get['route'] = 'common/home';
+
+			return;
+		}
+
+		// Don't parse if route is already set
+		if (!empty($this->request->get['route'])) {
+			// non-SEO to SEO URLs Redirection
+			if ($this->config->get('config_seo_nonseo_red')) {
+				$this->checkNonseoRedirection($this->request->get['route']);
+			}
+
+			return;
+		}
+
+		// non-SEO variables
+		if (!empty($query_string)) {
+			$query_array = $this->uri->getQuery(true);
+			$this->parseNonSeoVariables($query_array);
+
+			if ($this->config->get('config_seo_canonical')) {
+				$canonical_link = htmlspecialchars($this->url->getDomain().$route);
+
+				$this->document->addLink($canonical_link, 'canonical');
+			}
+		}
+
+		$seo_url = str_replace('index.php', '', $route);
+		$seo_url = ltrim($seo_url, '/');
+
+		// Add language code to URL
+		$is_lang_home = false;
+		if ($this->config->get('config_seo_lang_code')) {
+			if ($seo_url == $this->session->data['language']) {
+				$is_lang_home = true;
+			}
+
+			$seo_url = ltrim($seo_url, $this->session->data['language']);
+			$seo_url = ltrim($seo_url, '/');
+		}
+
+		// URLs are stored without suffix in database
+		if ($this->config->get('config_seo_suffix')) {
+			$seo_url = substr($seo_url, 0, -5);
+		}
+
+		$parts = explode('/', $seo_url);
+
+		// remove any empty arrays from trailing
+		if (utf8_strlen(end($parts)) == 0) {
+			array_pop($parts);
+		}
+
+		$seo = new Seo($this->registry);
         
-        foreach ($parts as $part) {
-            $query = $seo->getAliasQuery($part);
-
-            if (!empty($query) && strstr($query, '=')) {
-                $url = explode('=', $query);
-
-                switch ($url[0]) {
-                    case 'product_id':
-                        $this->request->get['product_id'] = $url[1];
-
-                        if (!$this->config->get('config_seo_category')) {
-                            $categories = array();
-
-                            $category_id = $seo->getCategoryIdBySortOrder($url[1]);
-
-                            if (!is_null($category_id)) {
-                                $categories = $seo->getParentCategoriesIds($category_id);
-
-                                $categories[] = $category_id;
-                            }
-
-                            if (!empty($categories)) {
-                                $this->request->get['path'] = implode('_', $categories);
-                            }
-                        }
-                        break;
-                    case 'category_id':
-                        if ($this->config->get('config_seo_category') == 'last') {
-                            $categories = $seo->getParentCategoriesIds($url[1]);
-
-                            $categories[] = $url[1];
-
-                            if (!empty($categories)) {
-                                $this->request->get['path'] = implode('_', $categories);
-                            }
-                        } else {
-                            if (!isset($this->request->get['path'])) {
-                                $this->request->get['path'] = $url[1];
-                            } else {
-                                $this->request->get['path'] .= '_' . $url[1];
-                            }
-                        }
-                        break;
-                    case 'blog_category_id':
-                        $this->request->get['route'] = 'blog/category';
-
-                        if ($this->config->get('config_seo_category') == 'last') {
-                            $categories = $seo->getParentCategoriesIds($url[1], 'blog_');
-
-                            $categories[] = $url[1];
-
-                            if (!empty($categories)) {
-                                $this->request->get['path'] = implode('_', $categories);
-                            }
-                        } else {
-                            if (!isset($this->request->get['path'])) {
-                                $this->request->get['path'] = $url[1];
-                            } else {
-                                $this->request->get['path'] .= '_' . $url[1];
-                            }
-                        }
-                        break;
-                    case 'blog_post_id':
-                        $this->request->get['route'] = 'blog/post';
-                        $this->request->get['post_id'] = $url[1];
-                        break;
-                    case 'manufacturer_id':
-                    case 'information_id':
-                    case 'route':
-                    default:
-                        $this->request->get[$url[0]] = $url[1];
-                        break;
-                }
-            } elseif ($is_lang_home) {
-                $this->request->get['route'] = 'common/home';
-
-                break;
-            } else {
-                $this->request->get['route'] = $seo_url;
-
-                break;
-            }
-        }
-
-        if (!isset($this->request->get['route'])) {
-            if (isset($this->request->get['product_id'])) {
-                $this->request->get['route'] = 'product/product';
-            } elseif (isset($this->request->get['path'])) {
-                $this->request->get['route'] = 'product/category';
-            } elseif (isset($this->request->get['manufacturer_id'])) {
-                $this->request->get['route'] = 'product/manufacturer/info';
-            } elseif (isset($this->request->get['information_id'])) {
-                $this->request->get['route'] = 'information/information';
-            }
-        }
-
-        unset($this->request->get['_route_']); // For B/C purpose
-    }
-
-    public function rewrite($link)
-    {
-        $url = '';
-        $is_home = false;
-
-        // common/currency, $data['redirect']
-        $link = str_replace('amp;amp;', 'amp;', $link);
-
-        $uri = new Uri($link);
-
-        if ($uri->getVar('route')) {
-            $seo = new Seo($this->registry);
-
-            switch ($uri->getVar('route')) {
-                case 'common/home':
-                    $is_home = true;
-                    break;
-                case 'product/product':
-                    if ($this->config->get('config_seo_category')) {
-                        if ($uri->getVar('path') && ($this->config->get('config_seo_category') == 'last')) {
-                            $categories = explode('_', $uri->getVar('path'));
-
-                            $categories = array(end($categories));
-                        } else {
-                            $categories = array();
-
-                            $category_id = $seo->getCategoryIdBySortOrder($uri->getVar('product_id'));
-
-                            if (!is_null($category_id)) {
-                                $categories = $seo->getParentCategoriesIds($category_id);
-
-                                $categories[] = $category_id;
-
-                                if ($this->config->get('config_seo_category') == 'last') {
-                                    $categories = array(end($categories));
-                                }
-                            }
-                        }
-
-                        foreach ($categories as $category) {
-                            $alias = $seo->getAlias($category, 'category');
-
-                            if ($alias) {
-                                $url .= '/' . $alias;
-                            }
-                        }
-
-                        $uri->delVar('path');
-                    }
-
-                    if ($uri->getVar('product_id')) {
-                        $alias = $seo->getAlias($uri->getVar('product_id'), 'product');
-
-                        if ($alias) {
-                            $url .= '/' . $alias;
-                        }
-
-                        $uri->delVar('product_id');
-                        $uri->delVar('manufacturer_id');
-                        $uri->delVar('path');
-                        $uri->delVar('search');
-                    }
-                    break;
-                case 'product/category':
-                    if ($uri->getVar('path')) {
-                        $categories = explode('_', $uri->getVar('path'));
-
-                        foreach ($categories as $category) {
-                            $alias = $seo->getAlias($category, 'category');
-
-                            if ($alias) {
-                                $url .= '/' . $alias;
-                            }
-                        }
-
-                        $uri->delVar('path');
-                    }
-                    break;
-                case 'information/information':
-                    if ($uri->getVar('information_id')) {
-                        $alias = $seo->getAlias($uri->getVar('information_id'), 'information');
-
-                        if ($alias) {
-                            $url .= '/' . $alias;
-                        }
-
-                        $uri->delVar('information_id');
-                    }
-                    break;
-                case 'product/manufacturer/info':
-                    if ($uri->getVar('manufacturer_id')) {
-                        $alias = $seo->getAlias($uri->getVar('manufacturer_id'), 'manufacturer');
-
-                        if ($alias) {
-                            $url .= '/' . $alias;
-                        }
-
-                        $uri->delVar('manufacturer_id');
-                    }
-                    break;
-                case 'blog/category':
-                    if ($uri->getVar('path')) {
-                        // Add blog home first
-                        $blog_home = $seo->getAlias('route=blog/home', 'other');
-
-                        if ($blog_home) {
-                            $url .= '/' . $blog_home;
-                        }
-
-                        $categories = explode('_', $uri->getVar('path'));
-
-                        foreach ($categories as $category) {
-                            $alias = $seo->getAlias($category, 'blog_category');
-
-                            if ($alias) {
-                                $url .= '/' . $alias;
-                            }
-                        }
-
-                        $uri->delVar('path');
-                    }
-                    break;
-                case 'blog/post':
-                    if ($uri->getVar('post_id')) {
-                        // Add blog home first
-                        $blog_home = $seo->getAlias('route=blog/home', 'other');
-
-                        if ($blog_home) {
-                            $url .= '/' . $blog_home;
-                        }
-
-                        $alias = $seo->getAlias($uri->getVar('post_id'), 'blog_post');
-
-                        if ($alias) {
-                            $url .= '/' . $alias;
-                        }
-
-                        $uri->delVar('post_id');
-                    }
-                    break;
-                default:
-                    $route = $uri->getVar('route');
-
-                    if (!$this->seoDisabled($route)) {
-                        $alias = $seo->getAlias('route='.$route, 'other');
-
-                        if (!empty($alias)) {
-                            $alias = str_replace('route=', '', $alias);
-
-                            $url = '/' . $alias;
-                        } else {
-                            $url = '/' . $route;
-                        }
-                    }
-
-                    break;
-            }
-
-            $uri->delVar('route');
-        }
-
-        if ($url || $is_home) {
-            // Add language code to URL
-            if ($this->config->get('config_seo_lang_code')) {
-                $url = '/'.$this->session->data['language'].$url;
-            }
-            $uri->delVar('lang');
-
-            // Append the suffix if enabled
-            if ($this->config->get('config_seo_suffix') && !$is_home) {
-                $url .= '.html';
-            }
-
-            $path = $uri->getPath();
-
-            if ($this->config->get('config_seo_rewrite') || ($is_home && !$this->config->get('config_seo_lang_code'))) {
-                $path = str_replace('index.php/', '', $path);
-                $path = str_replace('index.php', '', $path);
-            }
-
-            $path .= $url;
-
-            $uri->setPath($path);
-
-            return $uri->toString();
-        } else {
-            return $link;
-        }
-    }
-
-    public function checkNonseoRedirection($route)
-    {
-        if ($this->seoDisabled($route)) {
-            return;
-        }
-
-        $domain = $this->url->getDomain();
-
-        // Home page, redirect to domain with empty query
-        if ($route == 'common/home') {
-            $url = $this->rewrite($domain);
-
-            $this->response->redirect($url, 301);
-        } else {
-            $url_data = $this->request->get;
-            unset($url_data['lang']);
-            unset($url_data['_route_']); // For B/C purpose
-
-            if (!isset($url_data['route'])) {
-                $url_data['route'] = 'common/home';
-            }
-
-            $query = '';
-            if ($url_data) {
-                $query = 'index.php?'.urldecode(http_build_query($url_data, '', '&'));
-            }
-
-            $url = $domain.$query;
-
-            $url = $this->rewrite($url);
-
-            $this->response->redirect($url, 301);
-        }
-    }
-
-    public function checkWwwRedirection()
-    {
-        $redirect = false;
-
-        $host = $this->uri->getHost();
-
-        $www_red = $this->config->get('config_seo_www_red');
-        if (($www_red == 'with') and (strpos($host, 'www') !== 0)) {
-            $redirect = true;
-            $this->uri->setHost('www.'.$host);
-        } elseif (($www_red == 'non') and strpos($host, 'www') === 0) {
-            $redirect = true;
-            $this->uri->setHost(substr($host, 4, strlen($host)));
-        }
-
-        if ($redirect === false) {
-            return;
-        }
-
-        $this->response->redirect($this->uri->toString(), 301);
-    }
-
-    public function parseNonSeoVariables($query)
-    {
-        if (empty($query)) {
-            return;
-        }
-
-        foreach ($query as $variable => $value) {
-            if (is_array($value)) {
-                $this->parseNonSeoVariables($value);
-            } else {
-                // Removed as it breaks search and seems to be out of purpose
-                //$value = urlencode($value);
-
-                $this->request->get[$variable] = $value;
-            }
-        }
-    }
-
-    public function seoDisabled($route = '')
-    {
-        if (IS_ADMIN == true) {
-            return true;
-        }
-
-        // Do not generate SEO URLs if format available, to be used for format=raw, format=json etc
-        /*if (isset($this->request->get['format'])) {
+		foreach ($parts as $part) {
+			$query = $seo->getAliasQuery($part);
+
+			if (!empty($query) && strstr($query, '=')) {
+				$url = explode('=', $query);
+
+				switch ($url[0]) {
+					case 'product_id':
+						$this->request->get['product_id'] = $url[1];
+
+						if (!$this->config->get('config_seo_category')) {
+							$categories = array();
+
+							$category_id = $seo->getCategoryIdBySortOrder($url[1]);
+
+							if (!is_null($category_id)) {
+								$categories = $seo->getParentCategoriesIds($category_id);
+
+								$categories[] = $category_id;
+							}
+
+							if (!empty($categories)) {
+								$this->request->get['path'] = implode('_', $categories);
+							}
+						}
+						break;
+					case 'category_id':
+						if ($this->config->get('config_seo_category') == 'last') {
+							$categories = $seo->getParentCategoriesIds($url[1]);
+
+							$categories[] = $url[1];
+
+							if (!empty($categories)) {
+								$this->request->get['path'] = implode('_', $categories);
+							}
+						} else {
+							if (!isset($this->request->get['path'])) {
+								$this->request->get['path'] = $url[1];
+							} else {
+								$this->request->get['path'] .= '_' . $url[1];
+							}
+						}
+						break;
+					case 'blog_category_id':
+						$this->request->get['route'] = 'blog/category';
+
+						if ($this->config->get('config_seo_category') == 'last') {
+							$categories = $seo->getParentCategoriesIds($url[1], 'blog_');
+
+							$categories[] = $url[1];
+
+							if (!empty($categories)) {
+								$this->request->get['path'] = implode('_', $categories);
+							}
+						} else {
+							if (!isset($this->request->get['path'])) {
+								$this->request->get['path'] = $url[1];
+							} else {
+								$this->request->get['path'] .= '_' . $url[1];
+							}
+						}
+						break;
+					case 'blog_post_id':
+						$this->request->get['route'] = 'blog/post';
+						$this->request->get['post_id'] = $url[1];
+						break;
+					case 'manufacturer_id':
+					case 'information_id':
+					case 'route':
+					default:
+						$this->request->get[$url[0]] = $url[1];
+						break;
+				}
+			} elseif ($is_lang_home) {
+				$this->request->get['route'] = 'common/home';
+
+				break;
+			} else {
+				$this->request->get['route'] = $seo_url;
+
+				break;
+			}
+		}
+
+		if (!isset($this->request->get['route'])) {
+			if (isset($this->request->get['product_id'])) {
+				$this->request->get['route'] = 'product/product';
+			} elseif (isset($this->request->get['path'])) {
+				$this->request->get['route'] = 'product/category';
+			} elseif (isset($this->request->get['manufacturer_id'])) {
+				$this->request->get['route'] = 'product/manufacturer/info';
+			} elseif (isset($this->request->get['information_id'])) {
+				$this->request->get['route'] = 'information/information';
+			}
+		}
+
+		unset($this->request->get['_route_']); // For B/C purpose
+	}
+
+	public function rewrite($link)
+	{
+		$url = '';
+		$is_home = false;
+
+		// common/currency, $data['redirect']
+		$link = str_replace('amp;amp;', 'amp;', $link);
+
+		$uri = new Uri($link);
+
+		if ($uri->getVar('route')) {
+			$seo = new Seo($this->registry);
+
+			switch ($uri->getVar('route')) {
+				case 'common/home':
+					$is_home = true;
+					break;
+				case 'product/product':
+					if ($this->config->get('config_seo_category')) {
+						if ($uri->getVar('path') && ($this->config->get('config_seo_category') == 'last')) {
+							$categories = explode('_', $uri->getVar('path'));
+
+							$categories = array(end($categories));
+						} else {
+							$categories = array();
+
+							$category_id = $seo->getCategoryIdBySortOrder($uri->getVar('product_id'));
+
+							if (!is_null($category_id)) {
+								$categories = $seo->getParentCategoriesIds($category_id);
+
+								$categories[] = $category_id;
+
+								if ($this->config->get('config_seo_category') == 'last') {
+									$categories = array(end($categories));
+								}
+							}
+						}
+
+						foreach ($categories as $category) {
+							$alias = $seo->getAlias($category, 'category');
+
+							if ($alias) {
+								$url .= '/' . $alias;
+							}
+						}
+
+						$uri->delVar('path');
+					}
+
+					if ($uri->getVar('product_id')) {
+						$alias = $seo->getAlias($uri->getVar('product_id'), 'product');
+
+						if ($alias) {
+							$url .= '/' . $alias;
+						}
+
+						$uri->delVar('product_id');
+						$uri->delVar('manufacturer_id');
+						$uri->delVar('path');
+						$uri->delVar('search');
+					}
+					break;
+				case 'product/category':
+					if ($uri->getVar('path')) {
+						$categories = explode('_', $uri->getVar('path'));
+
+						foreach ($categories as $category) {
+							$alias = $seo->getAlias($category, 'category');
+
+							if ($alias) {
+								$url .= '/' . $alias;
+							}
+						}
+
+						$uri->delVar('path');
+					}
+					break;
+				case 'information/information':
+					if ($uri->getVar('information_id')) {
+						$alias = $seo->getAlias($uri->getVar('information_id'), 'information');
+
+						if ($alias) {
+							$url .= '/' . $alias;
+						}
+
+						$uri->delVar('information_id');
+					}
+					break;
+				case 'product/manufacturer/info':
+					if ($uri->getVar('manufacturer_id')) {
+						$alias = $seo->getAlias($uri->getVar('manufacturer_id'), 'manufacturer');
+
+						if ($alias) {
+							$url .= '/' . $alias;
+						}
+
+						$uri->delVar('manufacturer_id');
+					}
+					break;
+				case 'blog/category':
+					if ($uri->getVar('path')) {
+						// Add blog home first
+						$blog_home = $seo->getAlias('route=blog/home', 'other');
+
+						if ($blog_home) {
+							$url .= '/' . $blog_home;
+						}
+
+						$categories = explode('_', $uri->getVar('path'));
+
+						foreach ($categories as $category) {
+							$alias = $seo->getAlias($category, 'blog_category');
+
+							if ($alias) {
+								$url .= '/' . $alias;
+							}
+						}
+
+						$uri->delVar('path');
+					}
+					break;
+				case 'blog/post':
+					if ($uri->getVar('post_id')) {
+						// Add blog home first
+						$blog_home = $seo->getAlias('route=blog/home', 'other');
+
+						if ($blog_home) {
+							$url .= '/' . $blog_home;
+						}
+
+						$alias = $seo->getAlias($uri->getVar('post_id'), 'blog_post');
+
+						if ($alias) {
+							$url .= '/' . $alias;
+						}
+
+						$uri->delVar('post_id');
+					}
+					break;
+				default:
+					$route = $uri->getVar('route');
+
+					if (!$this->seoDisabled($route)) {
+						$alias = $seo->getAlias('route='.$route, 'other');
+
+						if (!empty($alias)) {
+							$alias = str_replace('route=', '', $alias);
+
+							$url = '/' . $alias;
+						} else {
+							$url = '/' . $route;
+						}
+					}
+
+					break;
+			}
+
+			$uri->delVar('route');
+		}
+
+		if ($url || $is_home) {
+			// Add language code to URL
+			if ($this->config->get('config_seo_lang_code')) {
+				$url = '/'.$this->session->data['language'].$url;
+			}
+			$uri->delVar('lang');
+
+			// Append the suffix if enabled
+			if ($this->config->get('config_seo_suffix') && !$is_home) {
+				$url .= '.html';
+			}
+
+			$path = $uri->getPath();
+
+			if ($this->config->get('config_seo_rewrite') || ($is_home && !$this->config->get('config_seo_lang_code'))) {
+				$path = str_replace('index.php/', '', $path);
+				$path = str_replace('index.php', '', $path);
+			}
+
+			$path .= $url;
+
+			$uri->setPath($path);
+
+			return $uri->toString();
+		} else {
+			return $link;
+		}
+	}
+
+	public function checkNonseoRedirection($route)
+	{
+		if ($this->seoDisabled($route)) {
+			return;
+		}
+
+		$domain = $this->url->getDomain();
+
+		// Home page, redirect to domain with empty query
+		if ($route == 'common/home') {
+			$url = $this->rewrite($domain);
+
+			$this->response->redirect($url, 301);
+		} else {
+			$url_data = $this->request->get;
+			unset($url_data['lang']);
+			unset($url_data['_route_']); // For B/C purpose
+
+			if (!isset($url_data['route'])) {
+				$url_data['route'] = 'common/home';
+			}
+
+			$query = '';
+			if ($url_data) {
+				$query = 'index.php?'.urldecode(http_build_query($url_data, '', '&'));
+			}
+
+			$url = $domain.$query;
+
+			$url = $this->rewrite($url);
+
+			$this->response->redirect($url, 301);
+		}
+	}
+
+	public function checkWwwRedirection()
+	{
+		$redirect = false;
+
+		$host = $this->uri->getHost();
+
+		$www_red = $this->config->get('config_seo_www_red');
+		if (($www_red == 'with') and (strpos($host, 'www') !== 0)) {
+			$redirect = true;
+			$this->uri->setHost('www.'.$host);
+		} elseif (($www_red == 'non') and strpos($host, 'www') === 0) {
+			$redirect = true;
+			$this->uri->setHost(substr($host, 4, strlen($host)));
+		}
+
+		if ($redirect === false) {
+			return;
+		}
+
+		$this->response->redirect($this->uri->toString(), 301);
+	}
+
+	public function parseNonSeoVariables($query)
+	{
+		if (empty($query)) {
+			return;
+		}
+
+		foreach ($query as $variable => $value) {
+			if (is_array($value)) {
+				$this->parseNonSeoVariables($value);
+			} else {
+				// Removed as it breaks search and seems to be out of purpose
+				//$value = urlencode($value);
+
+				$this->request->get[$variable] = $value;
+			}
+		}
+	}
+
+	public function seoDisabled($route = '')
+	{
+		if (IS_ADMIN == true) {
+			return true;
+		}
+
+		// Do not generate SEO URLs if format available, to be used for format=raw, format=json etc
+		/*if (isset($this->request->get['format'])) {
             return true;
         }*/
 
-        // Do not generate SEO URLs for special routes (payments, feeds)
-        $disabled_routes = array('payment/', 'feed/');
+		// Do not generate SEO URLs for special routes (payments, feeds)
+		$disabled_routes = array('payment/', 'feed/');
 
-        foreach($disabled_routes as $disabled_route) {
-            if (substr($route, 0, strlen($disabled_route)) == $disabled_route) {
-                return true;
-            }
-        }
+		foreach($disabled_routes as $disabled_route) {
+			if (substr($route, 0, strlen($disabled_route)) == $disabled_route) {
+				return true;
+			}
+		}
 
-        if ($this->request->isAjax()) {
-            return true;
-        }
+		if ($this->request->isAjax()) {
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -143,7 +143,7 @@ 
                             if (!isset($this->request->get['path'])) {
                                 $this->request->get['path'] = $url[1];
                             } else {
-                                $this->request->get['path'] .= '_' . $url[1];
+                                $this->request->get['path'] .= '_'.$url[1];
                             }
                         }
                         break;
@@ -162,7 +162,7 @@ 
                             if (!isset($this->request->get['path'])) {
                                 $this->request->get['path'] = $url[1];
                             } else {
-                                $this->request->get['path'] .= '_' . $url[1];
+                                $this->request->get['path'] .= '_'.$url[1];
                             }
                         }
                         break;
@@ -246,7 +246,7 @@ 
                             $alias = $seo->getAlias($category, 'category');
 
                             if ($alias) {
-                                $url .= '/' . $alias;
+                                $url .= '/'.$alias;
                             }
                         }
 
@@ -257,7 +257,7 @@ 
                         $alias = $seo->getAlias($uri->getVar('product_id'), 'product');
 
                         if ($alias) {
-                            $url .= '/' . $alias;
+                            $url .= '/'.$alias;
                         }
 
                         $uri->delVar('product_id');
@@ -274,7 +274,7 @@ 
                             $alias = $seo->getAlias($category, 'category');
 
                             if ($alias) {
-                                $url .= '/' . $alias;
+                                $url .= '/'.$alias;
                             }
                         }
 
@@ -286,7 +286,7 @@ 
                         $alias = $seo->getAlias($uri->getVar('information_id'), 'information');
 
                         if ($alias) {
-                            $url .= '/' . $alias;
+                            $url .= '/'.$alias;
                         }
 
                         $uri->delVar('information_id');
@@ -297,7 +297,7 @@ 
                         $alias = $seo->getAlias($uri->getVar('manufacturer_id'), 'manufacturer');
 
                         if ($alias) {
-                            $url .= '/' . $alias;
+                            $url .= '/'.$alias;
                         }
 
                         $uri->delVar('manufacturer_id');
@@ -309,7 +309,7 @@ 
                         $blog_home = $seo->getAlias('route=blog/home', 'other');
 
                         if ($blog_home) {
-                            $url .= '/' . $blog_home;
+                            $url .= '/'.$blog_home;
                         }
 
                         $categories = explode('_', $uri->getVar('path'));
@@ -318,7 +318,7 @@ 
                             $alias = $seo->getAlias($category, 'blog_category');
 
                             if ($alias) {
-                                $url .= '/' . $alias;
+                                $url .= '/'.$alias;
                             }
                         }
 
@@ -331,13 +331,13 @@ 
                         $blog_home = $seo->getAlias('route=blog/home', 'other');
 
                         if ($blog_home) {
-                            $url .= '/' . $blog_home;
+                            $url .= '/'.$blog_home;
                         }
 
                         $alias = $seo->getAlias($uri->getVar('post_id'), 'blog_post');
 
                         if ($alias) {
-                            $url .= '/' . $alias;
+                            $url .= '/'.$alias;
                         }
 
                         $uri->delVar('post_id');
@@ -352,9 +352,9 @@ 
                         if (!empty($alias)) {
                             $alias = str_replace('route=', '', $alias);
 
-                            $url = '/' . $alias;
+                            $url = '/'.$alias;
                         } else {
-                            $url = '/' . $route;
+                            $url = '/'.$route;
                         }
                     }
 
@@ -482,7 +482,7 @@ 
         // Do not generate SEO URLs for special routes (payments, feeds)
         $disabled_routes = array('payment/', 'feed/');
 
-        foreach($disabled_routes as $disabled_route) {
+        foreach ($disabled_routes as $disabled_route) {
             if (substr($route, 0, strlen($disabled_route)) == $disabled_route) {
                 return true;
             }

system/library/seo.php

Indentation +185 added lines, -185 removed lines

@@ -10,250 +10,250 @@
 class Seo extends Object
 {
 
-    protected $registry;
-
-    public function __construct($registry)
-    {
-        $this->registry = $registry;
-    }
-
-    public function __get($key)
-    {
-        return $this->registry->get($key);
-    }
-
-    public function __set($key, $value)
-    {
-        $this->registry->set($key, $value);
-    }
-
-    public function getAlias($id, $type = 'product')
-    {
-        static $rows = array('product' => array(), 'category' => array(), 'manufacturer' => array(), 'information' => array(), 'blog_post' => array(), 'blog_category' => array(), 'other' => array());
+	protected $registry;
+
+	public function __construct($registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function __get($key)
+	{
+		return $this->registry->get($key);
+	}
+
+	public function __set($key, $value)
+	{
+		$this->registry->set($key, $value);
+	}
+
+	public function getAlias($id, $type = 'product')
+	{
+		static $rows = array('product' => array(), 'category' => array(), 'manufacturer' => array(), 'information' => array(), 'blog_post' => array(), 'blog_category' => array(), 'other' => array());
         
-        if ($type == 'other') {
-            $query = $id;
-        } else {
-            $id = intval($id);
+		if ($type == 'other') {
+			$query = $id;
+		} else {
+			$id = intval($id);
 
-            if (empty($id)) {
-                return '';
-            }
+			if (empty($id)) {
+				return '';
+			}
 
-            $query = $type.'_id='.$id;
-        }
+			$query = $type.'_id='.$id;
+		}
 
-        if (!isset($rows[$type][$id])) {
-            $results = $this->db->query("SELECT * FROM " . DB_PREFIX . "url_alias WHERE query = '" . $this->db->escape($query) . "'");
+		if (!isset($rows[$type][$id])) {
+			$results = $this->db->query("SELECT * FROM " . DB_PREFIX . "url_alias WHERE query = '" . $this->db->escape($query) . "'");
 
-            if ($results->num_rows) {
-                $tmp = '';
-                $found = '';
+			if ($results->num_rows) {
+				$tmp = '';
+				$found = '';
 
-                // Get the language id
-                $lang_id = $this->getLanguageId();
+				// Get the language id
+				$lang_id = $this->getLanguageId();
 
-                foreach ($results->rows as $result) {
-                    if (!$result['keyword']) {
-                        continue;
-                    }
+				foreach ($results->rows as $result) {
+					if (!$result['keyword']) {
+						continue;
+					}
 
-                    $tmp = $result['keyword'];
+					$tmp = $result['keyword'];
 
-                    if ($result['language_id'] != $lang_id) {
-                        continue;
-                    }
+					if ($result['language_id'] != $lang_id) {
+						continue;
+					}
 
-                    $found = $result['keyword'];
+					$found = $result['keyword'];
 
-                    break;
-                }
+					break;
+				}
 
-                $alias = !empty($found) ? $found : $tmp;
-            } else {
-                if ($type == 'other') {
-                    $alias = $id;
-                } else {
-                    $alias = $type.'-'.$id;
-                }
-            }
+				$alias = !empty($found) ? $found : $tmp;
+			} else {
+				if ($type == 'other') {
+					$alias = $id;
+				} else {
+					$alias = $type.'-'.$id;
+				}
+			}
 
-            $rows[$type][$id] = $alias;
-        }
+			$rows[$type][$id] = $alias;
+		}
 
-        return $rows[$type][$id];
-    }
+		return $rows[$type][$id];
+	}
 
-    public function getAliasQuery($keyword)
-    {
-        $query = false;
+	public function getAliasQuery($keyword)
+	{
+		$query = false;
 
-        $results = $this->db->query("SELECT * FROM " . DB_PREFIX . "url_alias WHERE keyword = '" . $this->db->escape($keyword) . "'");
+		$results = $this->db->query("SELECT * FROM " . DB_PREFIX . "url_alias WHERE keyword = '" . $this->db->escape($keyword) . "'");
 
-        if ($results->num_rows) {
-            $tmp = '';
-            $found = '';
+		if ($results->num_rows) {
+			$tmp = '';
+			$found = '';
 
-            // Get the language id
-            $lang_id = $this->getLanguageId();
+			// Get the language id
+			$lang_id = $this->getLanguageId();
 
-            foreach ($results->rows as $result) {
-                if (!$result['query']) {
-                    continue;
-                }
+			foreach ($results->rows as $result) {
+				if (!$result['query']) {
+					continue;
+				}
 
-                $tmp = $result['query'];
+				$tmp = $result['query'];
 
-                if ($result['language_id'] != $lang_id) {
-                    continue;
-                }
+				if ($result['language_id'] != $lang_id) {
+					continue;
+				}
 
-                $found = $result['query'];
+				$found = $result['query'];
 
-                break;
-            }
+				break;
+			}
 
-            $query = !empty($found) ? $found : $tmp;
-        } elseif (strpos($keyword, '-')) {
-            $tmp = explode('-', $keyword);
-            $routes = array('product', 'category', 'manufacturer', 'information', 'blog_post', 'blog_category');
+			$query = !empty($found) ? $found : $tmp;
+		} elseif (strpos($keyword, '-')) {
+			$tmp = explode('-', $keyword);
+			$routes = array('product', 'category', 'manufacturer', 'information', 'blog_post', 'blog_category');
 
-            if (!empty($tmp[0]) && in_array($tmp[0], $routes) && !empty($tmp[1]) && is_numeric($tmp[1])) {
-                $query = $tmp[0].'_id='.$tmp[1];
-            }
-        }
+			if (!empty($tmp[0]) && in_array($tmp[0], $routes) && !empty($tmp[1]) && is_numeric($tmp[1])) {
+				$query = $tmp[0].'_id='.$tmp[1];
+			}
+		}
 
-        return $query;
-    }
+		return $query;
+	}
 
-    public function getLanguageId()
-    {
-        static $data = array();
+	public function getLanguageId()
+	{
+		static $data = array();
 
-        if ($this->config->get('config_seo_translate')) {
-            $code = $this->session->data['language'];
-        } else {
-            $code = $this->config->get('config_language');
-        }
+		if ($this->config->get('config_seo_translate')) {
+			$code = $this->session->data['language'];
+		} else {
+			$code = $this->config->get('config_language');
+		}
 
-        if (!isset($data[$code])) {
-            $sql = $this->db->query("SELECT language_id FROM `" . DB_PREFIX . "language` WHERE status = '1' AND code = '" . $this->db->escape($code) . "' LIMIT 1");
+		if (!isset($data[$code])) {
+			$sql = $this->db->query("SELECT language_id FROM `" . DB_PREFIX . "language` WHERE status = '1' AND code = '" . $this->db->escape($code) . "' LIMIT 1");
 
-            if ($sql->num_rows) {
-                $data[$code] = $sql->row['language_id'];
-            } else {
-                $data[$code] = 1;
-            }
-        }
+			if ($sql->num_rows) {
+				$data[$code] = $sql->row['language_id'];
+			} else {
+				$data[$code] = 1;
+			}
+		}
 
-        return $data[$code];
-    }
+		return $data[$code];
+	}
 
-    public function generateAlias($title, $id = null, $language_id = null)
-    {
-        $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+	public function generateAlias($title, $id = null, $language_id = null)
+	{
+		$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
 
-        $alias = $this->safeAlias($title);
+		$alias = $this->safeAlias($title);
 
-        if ($id && $language_id) {
-            $count = 0;
-            $baseAlias = $alias;
+		if ($id && $language_id) {
+			$count = 0;
+			$baseAlias = $alias;
 
-            while ($this->db->query("SELECT COUNT(*) AS count FROM " . DB_PREFIX . "url_alias WHERE keyword = '" . $this->db->escape($alias) . "' AND language_id = '" . (int)$language_id . "'")->row['count'] > 0) {
-                if ($count == 0) {
-                    $baseAlias = ($alias = $alias . '-' . $id) . '-';
-                } else {
-                    $alias = $baseAlias . $count;
-                }
+			while ($this->db->query("SELECT COUNT(*) AS count FROM " . DB_PREFIX . "url_alias WHERE keyword = '" . $this->db->escape($alias) . "' AND language_id = '" . (int)$language_id . "'")->row['count'] > 0) {
+				if ($count == 0) {
+					$baseAlias = ($alias = $alias . '-' . $id) . '-';
+				} else {
+					$alias = $baseAlias . $count;
+				}
 
-                $count++;
-            }
-        }
+				$count++;
+			}
+		}
 
-        return $alias;
-    }
+		return $alias;
+	}
 
-    // From Joomla.Platform
-    public function safeAlias($string)
-    {
-        // Replace double byte whitespaces by single byte (East Asian languages)
-        $str = preg_replace('/\xE3\x80\x80/', ' ', $string);
+	// From Joomla.Platform
+	public function safeAlias($string)
+	{
+		// Replace double byte whitespaces by single byte (East Asian languages)
+		$str = preg_replace('/\xE3\x80\x80/', ' ', $string);
 
-        // Remove any '-' from the string as they will be used as concatenator.
-        // Would be great to let the spaces in but only Firefox is friendly with this
+		// Remove any '-' from the string as they will be used as concatenator.
+		// Would be great to let the spaces in but only Firefox is friendly with this
 
-        $str = str_replace('-', ' ', $str);
+		$str = str_replace('-', ' ', $str);
 
-        // Replace forbidden characters by whitespaces
-        $str = preg_replace('#[:\#\*"@+=;!><&\.%()\]\/\'\\\\|\[]#', "\x20", $str);
+		// Replace forbidden characters by whitespaces
+		$str = preg_replace('#[:\#\*"@+=;!><&\.%()\]\/\'\\\\|\[]#', "\x20", $str);
 
-        // Delete all '?'
-        $str = str_replace('?', '', $str);
+		// Delete all '?'
+		$str = str_replace('?', '', $str);
 
-        // Trim white spaces at beginning and end of alias and make lowercase
-        $str = trim(utf8_strtolower($str));
+		// Trim white spaces at beginning and end of alias and make lowercase
+		$str = trim(utf8_strtolower($str));
 
-        // Remove any duplicate whitespace and replace whitespaces by hyphens
-        $str = preg_replace('#\x20+#', '-', $str);
+		// Remove any duplicate whitespace and replace whitespaces by hyphens
+		$str = preg_replace('#\x20+#', '-', $str);
 
-        return $str;
-    }
+		return $str;
+	}
 
-    public function getCategoryIdBySortOrder($product_id)
-    {
-        static $data = array();
+	public function getCategoryIdBySortOrder($product_id)
+	{
+		static $data = array();
 
-        if (!isset($data[$product_id])) {
-            $data[$product_id] = null;
+		if (!isset($data[$product_id])) {
+			$data[$product_id] = null;
 
-            $sql = "SELECT pc.category_id FROM " . DB_PREFIX . "product_to_category AS pc";
-            $sql .= " LEFT JOIN " . DB_PREFIX . "category AS c ON (pc.category_id = c.category_id)";
-            $sql .= " LEFT JOIN " . DB_PREFIX . "category_to_store c2s ON (c.category_id = c2s.category_id)";
-            $sql .= " WHERE pc.product_id = '" . (int)$product_id . "'";
-            $sql .= " AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "'";
-            $sql .= " AND c.status = '1'";
-            $sql .= " ORDER BY c.sort_order";
-            $sql .= " LIMIT 1";
+			$sql = "SELECT pc.category_id FROM " . DB_PREFIX . "product_to_category AS pc";
+			$sql .= " LEFT JOIN " . DB_PREFIX . "category AS c ON (pc.category_id = c.category_id)";
+			$sql .= " LEFT JOIN " . DB_PREFIX . "category_to_store c2s ON (c.category_id = c2s.category_id)";
+			$sql .= " WHERE pc.product_id = '" . (int)$product_id . "'";
+			$sql .= " AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "'";
+			$sql .= " AND c.status = '1'";
+			$sql .= " ORDER BY c.sort_order";
+			$sql .= " LIMIT 1";
 
-            $query = $this->db->query($sql);
+			$query = $this->db->query($sql);
 
-            if (!$query->num_rows) {
-                return $data[$product_id];
-            }
+			if (!$query->num_rows) {
+				return $data[$product_id];
+			}
 
-            $data[$product_id] = $query->row['category_id'];
-        }
+			$data[$product_id] = $query->row['category_id'];
+		}
 
-        return $data[$product_id];
-    }
+		return $data[$product_id];
+	}
 
-    public function getParentCategoriesIds($category_id = 0, $table_prefix = '')
-    {
-        static $data = array();
+	public function getParentCategoriesIds($category_id = 0, $table_prefix = '')
+	{
+		static $data = array();
 
-        $unique_id = $table_prefix . $category_id;
+		$unique_id = $table_prefix . $category_id;
 
-        if (!isset($data[$unique_id])) {
-            $data[$unique_id] = array();
+		if (!isset($data[$unique_id])) {
+			$data[$unique_id] = array();
 
-            $sql = "SELECT c.parent_id FROM " . DB_PREFIX . $table_prefix . "category c";
-            $sql .= " LEFT JOIN " . DB_PREFIX . $table_prefix . "category_to_store c2s ON (c.category_id = c2s.category_id)";
-            $sql .= " WHERE c.category_id = '" . (int)$category_id . "'";
-            $sql .= " AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "'";
-            $sql .= " ORDER BY c.sort_order";
-            $sql .= " LIMIT 1";
+			$sql = "SELECT c.parent_id FROM " . DB_PREFIX . $table_prefix . "category c";
+			$sql .= " LEFT JOIN " . DB_PREFIX . $table_prefix . "category_to_store c2s ON (c.category_id = c2s.category_id)";
+			$sql .= " WHERE c.category_id = '" . (int)$category_id . "'";
+			$sql .= " AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "'";
+			$sql .= " ORDER BY c.sort_order";
+			$sql .= " LIMIT 1";
 
-            $query = $this->db->query($sql);
+			$query = $this->db->query($sql);
 
-            if (empty($query->row) || !isset($query->row['parent_id'])) {
-                return $data[$unique_id];
-            }
+			if (empty($query->row) || !isset($query->row['parent_id'])) {
+				return $data[$unique_id];
+			}
 
-            $data[$unique_id][] = $query->row['parent_id'];
+			$data[$unique_id][] = $query->row['parent_id'];
 
-            $data[$unique_id] = array_merge($this->getParentCategoriesIds($query->row['parent_id']), $data[$unique_id]);
-        }
+			$data[$unique_id] = array_merge($this->getParentCategoriesIds($query->row['parent_id']), $data[$unique_id]);
+		}
 
-        return $data[$unique_id];
-    }
+		return $data[$unique_id];
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -44,7 +44,7 @@ 
         }
 
         if (!isset($rows[$type][$id])) {
-            $results = $this->db->query("SELECT * FROM " . DB_PREFIX . "url_alias WHERE query = '" . $this->db->escape($query) . "'");
+            $results = $this->db->query("SELECT * FROM ".DB_PREFIX."url_alias WHERE query = '".$this->db->escape($query)."'");
 
             if ($results->num_rows) {
                 $tmp = '';
@@ -88,7 +88,7 @@ 
     {
         $query = false;
 
-        $results = $this->db->query("SELECT * FROM " . DB_PREFIX . "url_alias WHERE keyword = '" . $this->db->escape($keyword) . "'");
+        $results = $this->db->query("SELECT * FROM ".DB_PREFIX."url_alias WHERE keyword = '".$this->db->escape($keyword)."'");
 
         if ($results->num_rows) {
             $tmp = '';
@@ -137,7 +137,7 @@ 
         }
 
         if (!isset($data[$code])) {
-            $sql = $this->db->query("SELECT language_id FROM `" . DB_PREFIX . "language` WHERE status = '1' AND code = '" . $this->db->escape($code) . "' LIMIT 1");
+            $sql = $this->db->query("SELECT language_id FROM `".DB_PREFIX."language` WHERE status = '1' AND code = '".$this->db->escape($code)."' LIMIT 1");
 
             if ($sql->num_rows) {
                 $data[$code] = $sql->row['language_id'];
@@ -159,11 +159,11 @@ 
             $count = 0;
             $baseAlias = $alias;
 
-            while ($this->db->query("SELECT COUNT(*) AS count FROM " . DB_PREFIX . "url_alias WHERE keyword = '" . $this->db->escape($alias) . "' AND language_id = '" . (int)$language_id . "'")->row['count'] > 0) {
+            while ($this->db->query("SELECT COUNT(*) AS count FROM ".DB_PREFIX."url_alias WHERE keyword = '".$this->db->escape($alias)."' AND language_id = '".(int)$language_id."'")->row['count'] > 0) {
                 if ($count == 0) {
-                    $baseAlias = ($alias = $alias . '-' . $id) . '-';
+                    $baseAlias = ($alias = $alias.'-'.$id).'-';
                 } else {
-                    $alias = $baseAlias . $count;
+                    $alias = $baseAlias.$count;
                 }
 
                 $count++;
@@ -206,11 +206,11 @@ 
         if (!isset($data[$product_id])) {
             $data[$product_id] = null;
 
-            $sql = "SELECT pc.category_id FROM " . DB_PREFIX . "product_to_category AS pc";
-            $sql .= " LEFT JOIN " . DB_PREFIX . "category AS c ON (pc.category_id = c.category_id)";
-            $sql .= " LEFT JOIN " . DB_PREFIX . "category_to_store c2s ON (c.category_id = c2s.category_id)";
-            $sql .= " WHERE pc.product_id = '" . (int)$product_id . "'";
-            $sql .= " AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "'";
+            $sql = "SELECT pc.category_id FROM ".DB_PREFIX."product_to_category AS pc";
+            $sql .= " LEFT JOIN ".DB_PREFIX."category AS c ON (pc.category_id = c.category_id)";
+            $sql .= " LEFT JOIN ".DB_PREFIX."category_to_store c2s ON (c.category_id = c2s.category_id)";
+            $sql .= " WHERE pc.product_id = '".(int)$product_id."'";
+            $sql .= " AND c2s.store_id = '".(int)$this->config->get('config_store_id')."'";
             $sql .= " AND c.status = '1'";
             $sql .= " ORDER BY c.sort_order";
             $sql .= " LIMIT 1";
@@ -231,15 +231,15 @@ 
     {
         static $data = array();
 
-        $unique_id = $table_prefix . $category_id;
+        $unique_id = $table_prefix.$category_id;
 
         if (!isset($data[$unique_id])) {
             $data[$unique_id] = array();
 
-            $sql = "SELECT c.parent_id FROM " . DB_PREFIX . $table_prefix . "category c";
-            $sql .= " LEFT JOIN " . DB_PREFIX . $table_prefix . "category_to_store c2s ON (c.category_id = c2s.category_id)";
-            $sql .= " WHERE c.category_id = '" . (int)$category_id . "'";
-            $sql .= " AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "'";
+            $sql = "SELECT c.parent_id FROM ".DB_PREFIX.$table_prefix."category c";
+            $sql .= " LEFT JOIN ".DB_PREFIX.$table_prefix."category_to_store c2s ON (c.category_id = c2s.category_id)";
+            $sql .= " WHERE c.category_id = '".(int)$category_id."'";
+            $sql .= " AND c2s.store_id = '".(int)$this->config->get('config_store_id')."'";
             $sql .= " ORDER BY c.sort_order";
             $sql .= " LIMIT 1";
 

system/library/utility.php

Indentation +195 added lines, -195 removed lines

@@ -10,211 +10,211 @@
 class Utility extends Object
 {
 
-    protected $registry;
-
-    public function __construct($registry)
-    {
-        $this->registry = $registry;
-    }
-
-    public function __get($key)
-    {
-        return $this->registry->get($key);
-    }
-
-    public function __set($key, $value)
-    {
-        $this->registry->set($key, $value);
-    }
-
-    public function getLanguage()
-    {
-        $lang = null;
-        $languages = array();
-
-        $prefix = Client::isAdmin() ? 'admin_' : '';
-
-        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "language` WHERE status = '1'");
-
-        foreach ($query->rows as $result) {
-            $languages[$result['code']] = $result;
-        }
-
-        if (isset($this->request->get['lang']) && array_key_exists($this->request->get['lang'], $languages) && $languages[$this->request->get['lang']]['status']) {
-            $code = $this->request->get['lang'];
-        } elseif (isset($this->session->data[$prefix.'language']) && array_key_exists($this->session->data[$prefix.'language'], $languages) && $languages[$this->session->data[$prefix.'language']]['status']) {
-            $code = $this->session->data[$prefix.'language'];
-        } elseif (isset($this->request->cookie[$prefix.'language']) && array_key_exists($this->request->cookie[$prefix.'language'], $languages) && $languages[$this->request->cookie[$prefix.'language']]['status']) {
-            $code = $this->request->cookie[$prefix.'language'];
-        } else {
-            // Try to get the language from SEF URL
-            if (Client::isCatalog() && $this->config->get('config_seo_url')) {
-                $route = str_replace($this->url->getFullUrl(), '', rawurldecode($this->uri->toString()));
-                $route = str_replace('?'.$this->uri->getQuery(), '', $route);
-                $route_parts = explode('/', str_replace('index.php/', '', $route));
-
-                if (!empty($route_parts[0]) && (strlen($route_parts[0]) == 2)) {
-                    $code = $route_parts[0];
-                } else {
-                    $code = $this->getBrowserDefaultLanguage($languages);
-                }
-            } else {
-                $code = $this->getBrowserDefaultLanguage($languages);
-            }
-        }
-
-        // Check if lang code exists in db, otherwise return the first lang
-        if (isset($languages[$code])) {
-            $lang = $languages[$code];
-        } else {
-            reset($languages);
-            $lang = current($languages);
-        }
-
-        return $lang;
-    }
-
-    public function getBrowserDefaultLanguage($languages)
-    {
-        $browser = $this->getBrowserLangCode($languages);
-
-        if (is_object($this->config)) {
-            $default = Client::isAdmin() ? $this->config->get('config_admin_language') : $this->config->get('config_language');
-        } else {
-            $default = 'en';
-        }
-
-        $code = $browser ? $browser : $default;
-
-        return $code;
-    }
-
-    public function getDefaultLanguage()
-    {
-        if (!is_object($this->config)) {
-            return;
-        }
-
-        $store_id = $this->config->get('config_store_id');
-
-        if (Client::isAdmin()) {
-            $sql = "SELECT * FROM " . DB_PREFIX . "setting WHERE `key` = 'config_admin_language' AND `store_id` = '" . $store_id . "'";
-        } else {
-            $sql = "SELECT * FROM " . DB_PREFIX . "setting WHERE `key` = 'config_language' AND `store_id` = '" . $store_id . "'";
-        }
-        $query = $this->db->query($sql);
-        $code = $query->row['value'];
-
-        $language = $this->db->query("SELECT * FROM " . DB_PREFIX . "language WHERE `code` = '" . $code . "'");
-
-        return $language->row;
-    }
-
-    public function getBrowserLangCode($system_langs)
-    {
-        $lang = null;
-
-        if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            return $lang;
-        }
-
-        $browser_langs = explode(',', $this->request->server['HTTP_ACCEPT_LANGUAGE']);
-
-        foreach ($browser_langs as $browser_lang) {
-            // Slice out the part before ; on first step, the part before - on second, place into array
-            $browser_lang = substr($browser_lang, 0, strcspn($browser_lang, ';'));
-            $primary_browser_lang = substr($browser_lang, 0, 2);
-
-            foreach ($system_langs as $system_lang) {
-                if (!$system_lang['status']) {
-                    continue;
-                }
-
-                $system_code = $system_lang['code'];
-                $system_dir = $system_lang['directory'];
-
-                // Take off 3 letters (zh-yue) iso code languages as they can't match browsers' languages and default them to en
-                // http://www.w3.org/International/articles/language-tags/#extlang
-                if (strlen($system_dir) > 5) {
-                    continue;
-                }
-
-                if (strtolower($browser_lang) == strtolower(substr($system_dir, 0, strlen($browser_lang)))) {
-                    return $system_code;
-                } elseif ($primary_browser_lang == substr($system_dir, 0, 2)) {
-                    $primary_detected_code = $system_code;
-                }
-            }
-
-            if (isset($primary_detected_code)) {
-                return $primary_detected_code;
-            }
-        }
-
-        return $lang;
-    }
-
-    public function getInfo()
-    {
-        $info = array();
-
-        $info['arastta'] = VERSION;
-
-        $info['php'] = phpversion();
-
-        if (method_exists($this->db, 'getVersion')) {
-            $info['mysql'] = $this->db->getVersion();
-        } else {
-            $info['mysql'] = 'N/A';
-        }
+	protected $registry;
+
+	public function __construct($registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function __get($key)
+	{
+		return $this->registry->get($key);
+	}
+
+	public function __set($key, $value)
+	{
+		$this->registry->set($key, $value);
+	}
+
+	public function getLanguage()
+	{
+		$lang = null;
+		$languages = array();
+
+		$prefix = Client::isAdmin() ? 'admin_' : '';
+
+		$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "language` WHERE status = '1'");
+
+		foreach ($query->rows as $result) {
+			$languages[$result['code']] = $result;
+		}
+
+		if (isset($this->request->get['lang']) && array_key_exists($this->request->get['lang'], $languages) && $languages[$this->request->get['lang']]['status']) {
+			$code = $this->request->get['lang'];
+		} elseif (isset($this->session->data[$prefix.'language']) && array_key_exists($this->session->data[$prefix.'language'], $languages) && $languages[$this->session->data[$prefix.'language']]['status']) {
+			$code = $this->session->data[$prefix.'language'];
+		} elseif (isset($this->request->cookie[$prefix.'language']) && array_key_exists($this->request->cookie[$prefix.'language'], $languages) && $languages[$this->request->cookie[$prefix.'language']]['status']) {
+			$code = $this->request->cookie[$prefix.'language'];
+		} else {
+			// Try to get the language from SEF URL
+			if (Client::isCatalog() && $this->config->get('config_seo_url')) {
+				$route = str_replace($this->url->getFullUrl(), '', rawurldecode($this->uri->toString()));
+				$route = str_replace('?'.$this->uri->getQuery(), '', $route);
+				$route_parts = explode('/', str_replace('index.php/', '', $route));
+
+				if (!empty($route_parts[0]) && (strlen($route_parts[0]) == 2)) {
+					$code = $route_parts[0];
+				} else {
+					$code = $this->getBrowserDefaultLanguage($languages);
+				}
+			} else {
+				$code = $this->getBrowserDefaultLanguage($languages);
+			}
+		}
+
+		// Check if lang code exists in db, otherwise return the first lang
+		if (isset($languages[$code])) {
+			$lang = $languages[$code];
+		} else {
+			reset($languages);
+			$lang = current($languages);
+		}
+
+		return $lang;
+	}
+
+	public function getBrowserDefaultLanguage($languages)
+	{
+		$browser = $this->getBrowserLangCode($languages);
+
+		if (is_object($this->config)) {
+			$default = Client::isAdmin() ? $this->config->get('config_admin_language') : $this->config->get('config_language');
+		} else {
+			$default = 'en';
+		}
+
+		$code = $browser ? $browser : $default;
+
+		return $code;
+	}
+
+	public function getDefaultLanguage()
+	{
+		if (!is_object($this->config)) {
+			return;
+		}
+
+		$store_id = $this->config->get('config_store_id');
+
+		if (Client::isAdmin()) {
+			$sql = "SELECT * FROM " . DB_PREFIX . "setting WHERE `key` = 'config_admin_language' AND `store_id` = '" . $store_id . "'";
+		} else {
+			$sql = "SELECT * FROM " . DB_PREFIX . "setting WHERE `key` = 'config_language' AND `store_id` = '" . $store_id . "'";
+		}
+		$query = $this->db->query($sql);
+		$code = $query->row['value'];
+
+		$language = $this->db->query("SELECT * FROM " . DB_PREFIX . "language WHERE `code` = '" . $code . "'");
+
+		return $language->row;
+	}
+
+	public function getBrowserLangCode($system_langs)
+	{
+		$lang = null;
+
+		if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+			return $lang;
+		}
+
+		$browser_langs = explode(',', $this->request->server['HTTP_ACCEPT_LANGUAGE']);
+
+		foreach ($browser_langs as $browser_lang) {
+			// Slice out the part before ; on first step, the part before - on second, place into array
+			$browser_lang = substr($browser_lang, 0, strcspn($browser_lang, ';'));
+			$primary_browser_lang = substr($browser_lang, 0, 2);
+
+			foreach ($system_langs as $system_lang) {
+				if (!$system_lang['status']) {
+					continue;
+				}
+
+				$system_code = $system_lang['code'];
+				$system_dir = $system_lang['directory'];
+
+				// Take off 3 letters (zh-yue) iso code languages as they can't match browsers' languages and default them to en
+				// http://www.w3.org/International/articles/language-tags/#extlang
+				if (strlen($system_dir) > 5) {
+					continue;
+				}
+
+				if (strtolower($browser_lang) == strtolower(substr($system_dir, 0, strlen($browser_lang)))) {
+					return $system_code;
+				} elseif ($primary_browser_lang == substr($system_dir, 0, 2)) {
+					$primary_detected_code = $system_code;
+				}
+			}
+
+			if (isset($primary_detected_code)) {
+				return $primary_detected_code;
+			}
+		}
+
+		return $lang;
+	}
+
+	public function getInfo()
+	{
+		$info = array();
+
+		$info['arastta'] = VERSION;
+
+		$info['php'] = phpversion();
+
+		if (method_exists($this->db, 'getVersion')) {
+			$info['mysql'] = $this->db->getVersion();
+		} else {
+			$info['mysql'] = 'N/A';
+		}
 
-        $langs = array();
-        $languages = $this->getLanguages();
-        foreach ($languages as $language) {
-            $langs[] = $language['code'];
-        }
+		$langs = array();
+		$languages = $this->getLanguages();
+		foreach ($languages as $language) {
+			$langs[] = $language['code'];
+		}
 
-        $info['langs'] = implode(',', $langs);
+		$info['langs'] = implode(',', $langs);
 
-        $info['stores'] = (int) $this->getTotalStores() + 1;
+		$info['stores'] = (int) $this->getTotalStores() + 1;
 
-        $info['api'] = $this->config->get('api_key', '');
+		$info['api'] = $this->config->get('api_key', '');
 
-        return $info;
-    }
+		return $info;
+	}
 
-    public function getLanguages()
-    {
-        $language_data = $this->cache->get('language');
+	public function getLanguages()
+	{
+		$language_data = $this->cache->get('language');
 
-        if (!$language_data) {
-            $language_data = array();
-
-            $query = $this->db->query("SELECT * FROM " . DB_PREFIX . "language WHERE status = 1 ORDER BY sort_order, name");
+		if (!$language_data) {
+			$language_data = array();
+
+			$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "language WHERE status = 1 ORDER BY sort_order, name");
 
-            foreach ($query->rows as $result) {
-                $language_data[$result['code']] = array(
-                    'language_id' => $result['language_id'],
-                    'name'        => $result['name'],
-                    'code'        => $result['code'],
-                    'locale'      => $result['locale'],
-                    'image'       => $result['image'],
-                    'directory'   => $result['directory'],
-                    'sort_order'  => $result['sort_order'],
-                    'status'      => $result['status']
-                );
-            }
+			foreach ($query->rows as $result) {
+				$language_data[$result['code']] = array(
+					'language_id' => $result['language_id'],
+					'name'        => $result['name'],
+					'code'        => $result['code'],
+					'locale'      => $result['locale'],
+					'image'       => $result['image'],
+					'directory'   => $result['directory'],
+					'sort_order'  => $result['sort_order'],
+					'status'      => $result['status']
+				);
+			}
 
-            $this->cache->set('language', $language_data);
-        }
+			$this->cache->set('language', $language_data);
+		}
 
-        return $language_data;
-    }
+		return $language_data;
+	}
 
-    public function getTotalStores()
-    {
-        $query = $this->db->query("SELECT COUNT(*) AS total FROM " . DB_PREFIX . "store");
+	public function getTotalStores()
+	{
+		$query = $this->db->query("SELECT COUNT(*) AS total FROM " . DB_PREFIX . "store");
 
-        return $query->row['total'];
-    }
+		return $query->row['total'];
+	}
 }

catalog/controller/blog/category.php

Indentation +377 added lines, -377 removed lines

@@ -10,439 +10,439 @@
 class ControllerBlogCategory extends Controller
 {
 
-    public function index()
-    {
-        $this->load->language('blog/category');
+	public function index()
+	{
+		$this->load->language('blog/category');
 
-        $this->load->model('blog/category');
+		$this->load->model('blog/category');
 
-        $this->load->model('blog/post');
-        $this->load->model('blog/comment');
+		$this->load->model('blog/post');
+		$this->load->model('blog/comment');
 
-        $this->load->model('tool/image');
+		$this->load->model('tool/image');
 
-        #Get All Language Text
-        $data = $this->language->all();
+		#Get All Language Text
+		$data = $this->language->all();
 
-        $filter = '';
+		$filter = '';
 
-        if (isset($this->request->get['filter'])) {
-            $filter = urldecode($this->request->get['filter']);
-        }
+		if (isset($this->request->get['filter'])) {
+			$filter = urldecode($this->request->get['filter']);
+		}
 
-        $default_post_sort_order = explode('-', $this->config->get('config_blog_post_list_sort_order'));
+		$default_post_sort_order = explode('-', $this->config->get('config_blog_post_list_sort_order'));
 
-        if (count($default_post_sort_order) > 1) {
-            $sort  = $default_post_sort_order[0];
-            $order = $default_post_sort_order[1];
-        } else {
-            $sort  = $default_post_sort_order[0];
-            $order = 'ASC';
-        }
+		if (count($default_post_sort_order) > 1) {
+			$sort  = $default_post_sort_order[0];
+			$order = $default_post_sort_order[1];
+		} else {
+			$sort  = $default_post_sort_order[0];
+			$order = 'ASC';
+		}
 
-        if (isset($this->request->get['sort'])) {
-            $sort = $this->request->get['sort'];
-        }
+		if (isset($this->request->get['sort'])) {
+			$sort = $this->request->get['sort'];
+		}
 
-        if (isset($this->request->get['order'])) {
-            $order = $this->request->get['order'];
-        }
+		if (isset($this->request->get['order'])) {
+			$order = $this->request->get['order'];
+		}
 
-        $page = 1;
+		$page = 1;
 
-        if (isset($this->request->get['page'])) {
-            $page = $this->request->get['page'];
-        }
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		}
 
-        $limit = $this->config->get('config_product_limit');
+		$limit = $this->config->get('config_product_limit');
 
-        if (isset($this->request->get['limit'])) {
-            $limit = $this->request->get['limit'];
-        }
+		if (isset($this->request->get['limit'])) {
+			$limit = $this->request->get['limit'];
+		}
 
-        $data['breadcrumbs'] = array();
+		$data['breadcrumbs'] = array();
 
-        $menu_home = $this->model_blog_post->checkMenu('home');
+		$menu_home = $this->model_blog_post->checkMenu('home');
 
-        $text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog') ;
+		$text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog') ;
 
-        $data['breadcrumbs'][] = array(
-            'text' => $this->language->get('text_home'),
-            'href' => $this->url->link('common/home')
-        );
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/home')
+		);
 
-        $data['breadcrumbs'][] = array(
-            'text' => $text_home,
-            'href' => $this->url->link('blog/home')
-        );
+		$data['breadcrumbs'][] = array(
+			'text' => $text_home,
+			'href' => $this->url->link('blog/home')
+		);
 
-        if (isset($this->request->get['path'])) {
-            $url = '';
+		if (isset($this->request->get['path'])) {
+			$url = '';
 
-            if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
-            }
+			if (isset($this->request->get['sort'])) {
+				$url .= '&sort=' . $this->request->get['sort'];
+			}
 
-            if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
-            }
+			if (isset($this->request->get['order'])) {
+				$url .= '&order=' . $this->request->get['order'];
+			}
 
-            if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
-            }
+			if (isset($this->request->get['limit'])) {
+				$url .= '&limit=' . $this->request->get['limit'];
+			}
 
-            $path = '';
+			$path = '';
 
-            $parts = explode('_', (string)$this->request->get['path']);
+			$parts = explode('_', (string)$this->request->get['path']);
 
-            $category_id = (int)array_pop($parts);
+			$category_id = (int)array_pop($parts);
 
-            foreach ($parts as $path_id) {
-                if (!$path) {
-                    $path = (int)$path_id;
-                } else {
-                    $path .= '_' . (int)$path_id;
-                }
+			foreach ($parts as $path_id) {
+				if (!$path) {
+					$path = (int)$path_id;
+				} else {
+					$path .= '_' . (int)$path_id;
+				}
 
-                $category_info = $this->model_blog_category->getCategory($path_id);
+				$category_info = $this->model_blog_category->getCategory($path_id);
 
-                if ($category_info) {
-                    $data['breadcrumbs'][] = array(
-                        'text' => $category_info['name'],
-                        'href' => $this->url->link('blog/category', 'path=' . $path . $url)
-                    );
-                }
-            }
-        } else {
-            $category_id = 0;
-        }
+				if ($category_info) {
+					$data['breadcrumbs'][] = array(
+						'text' => $category_info['name'],
+						'href' => $this->url->link('blog/category', 'path=' . $path . $url)
+					);
+				}
+			}
+		} else {
+			$category_id = 0;
+		}
 
-        $category_info = $this->model_blog_category->getCategory($category_id);
+		$category_info = $this->model_blog_category->getCategory($category_id);
 
-        if ($category_info) {
-            $title = empty($category_info['meta_title']) ? $category_info['name'] : $category_info['meta_title'];
+		if ($category_info) {
+			$title = empty($category_info['meta_title']) ? $category_info['name'] : $category_info['meta_title'];
 
-            $this->document->setTitle($title);
-            $this->document->setDescription($category_info['meta_description']);
-            $this->document->setKeywords($category_info['meta_keyword']);
-            if (!$this->config->get('config_seo_url')) {
-                $this->document->addLink($this->url->link('blog/category', 'path=' . $this->request->get['path']), 'canonical');
-            }
+			$this->document->setTitle($title);
+			$this->document->setDescription($category_info['meta_description']);
+			$this->document->setKeywords($category_info['meta_keyword']);
+			if (!$this->config->get('config_seo_url')) {
+				$this->document->addLink($this->url->link('blog/category', 'path=' . $this->request->get['path']), 'canonical');
+			}
 
-            if (is_file(DIR_CATALOG . 'view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css')) {
-                $this->document->addStyle('catalog/view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css');
-            } else {
-                $this->document->addStyle('catalog/view/theme/default/stylesheet/blog.css');
-            }
+			if (is_file(DIR_CATALOG . 'view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css')) {
+				$this->document->addStyle('catalog/view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css');
+			} else {
+				$this->document->addStyle('catalog/view/theme/default/stylesheet/blog.css');
+			}
 
-            $data['heading_title'] = $category_info['name'];
+			$data['heading_title'] = $category_info['name'];
 
-            // Set the last category breadcrumb
-            $data['breadcrumbs'][] = array(
-                'text' => $category_info['name'],
-                'href' => $this->url->link('blog/category', 'path=' . $this->request->get['path'])
-            );
+			// Set the last category breadcrumb
+			$data['breadcrumbs'][] = array(
+				'text' => $category_info['name'],
+				'href' => $this->url->link('blog/category', 'path=' . $this->request->get['path'])
+			);
 
-            $data['thumb'] = '';
+			$data['thumb'] = '';
 
-            if ($category_info['image']) {
-                $data['thumb'] = $this->model_tool_image->resize($category_info['image'], $this->config->get('config_image_category_width'), $this->config->get('config_image_category_height'));
-            }
+			if ($category_info['image']) {
+				$data['thumb'] = $this->model_tool_image->resize($category_info['image'], $this->config->get('config_image_category_width'), $this->config->get('config_image_category_height'));
+			}
 
-            $data['description'] = html_entity_decode($category_info['description'], ENT_QUOTES, 'UTF-8');
+			$data['description'] = html_entity_decode($category_info['description'], ENT_QUOTES, 'UTF-8');
 
-            $data['author'] = $this->config->get('config_blog_post_list_author');
-            $data['category'] = $this->config->get('config_blog_post_list_category', 1);
-            $data['date_added'] = $this->config->get('config_blog_post_list_date');
-            $data['viewed'] = $this->config->get('config_blog_post_list_read');
+			$data['author'] = $this->config->get('config_blog_post_list_author');
+			$data['category'] = $this->config->get('config_blog_post_list_category', 1);
+			$data['date_added'] = $this->config->get('config_blog_post_list_date');
+			$data['viewed'] = $this->config->get('config_blog_post_list_read');
 
-            $url = '';
+			$url = '';
 
-            if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
-            }
+			if (isset($this->request->get['filter'])) {
+				$url .= '&filter=' . urldecode($this->request->get['filter']);
+			}
 
-            if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
-            }
+			if (isset($this->request->get['sort'])) {
+				$url .= '&sort=' . $this->request->get['sort'];
+			}
 
-            if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
-            }
-
-            if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
-            }
-
-            $data['categories'] = array();
-
-            $results = $this->model_blog_category->getCategories($category_id);
-
-            foreach ($results as $result) {
-                $filter_data = array(
-                    'filter_category_id'  => $result['category_id'],
-                    'filter_sub_category' => true
-                );
-
-                $image = $this->model_tool_image->resize($result['image'], $this->config->get('config_image_category_width'), $this->config->get('config_image_category_height'));
-
-                $data['categories'][] = array(
-                    'name'  => $result['name'] . ($this->config->get('config_product_count') ? ' (' . $this->model_blog_post->getTotalPosts($filter_data) . ')' : ''),
-                    'href'  => $this->url->link('blog/category', 'path=' . $this->request->get['path'] . '_' . $result['category_id'] . $url),
-                    'thumb' => $image
-                );
-            }
-
-            $data['posts'] = array();
-
-            $filter_data = array(
-                'filter_category_id' => $category_id,
-                'filter_filter'      => $filter,
-                'sort'               => $sort,
-                'order'              => $order,
-                'start'              => ($page - 1) * $limit,
-                'limit'              => $limit
-            );
-
-            $post_total = $this->model_blog_post->getTotalPosts($filter_data);
-
-            $results = $this->model_blog_post->getPosts($filter_data);
-
-            foreach ($results as $result) {
-                $image = '';
-
-                if ($result['image']) {
-                    $image = $this->model_tool_image->resize($result['image'], $this->config->get('config_blog_post_list_width'), $this->config->get('config_blog_post_list_height'));
-                }
-
-                $category = $category_info['name'];
-
-                $comment_total = $this->model_blog_comment->getTotalCommentsByPostId($result['post_id']);
-
-                $this->trigger->fire('pre.post.display', array(&$result, 'category'));
-
-                $data['posts'][] = array(
-                    'post_id'       => $result['post_id'],
-                    'thumb'         => $image,
-                    'name'          => $result['name'],
-                    'description'   => $result['description'],
-                    'category'      => $category,
-                    'category_href' => $this->url->link('blog/category', 'path=' . $category_id),
-                    'viewed'        => $result['viewed'],
-                    'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
-                    'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
-                    'author'        => $result['author'],
-                    'author_href'   => $this->url->link('blog/home', 'filter_author=' . $result['author']),
-                    'href'          => $this->url->link('blog/post', 'path=' . $this->request->get['path'] . '&post_id=' . $result['post_id'])
-                );
-            }
-
-            $data['author'] = $this->config->get('config_blog_post_list_author');
-            $data['date_added'] = $this->config->get('config_blog_post_list_date');
-            $data['viewed'] = $this->config->get('config_blog_post_list_read');
-
-            $url = '';
-
-            if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
-            }
-
-            if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
-            }
-
-            $data['sorts'] = array();
-
-            $data['sorts'][] = array(
-                'text'  => $this->language->get('text_default'),
-                'value' => 'p.sort_order-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.sort_order&order=ASC' . $url)
-            );
-
-            $data['sorts'][] = array(
-                'text'  => $this->language->get('text_name_asc'),
-                'value' => 'pd.name-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=pd.name&order=ASC' . $url)
-            );
-
-            $data['sorts'][] = array(
-                'text'  => $this->language->get('text_name_desc'),
-                'value' => 'pd.name-DESC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=pd.name&order=DESC' . $url)
-            );
-
-            $data['sorts'][] = array(
-                'text'  => $this->language->get('text_price_asc'),
-                'value' => 'p.price-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.price&order=ASC' . $url)
-            );
-
-            $data['sorts'][] = array(
-                'text'  => $this->language->get('text_price_desc'),
-                'value' => 'p.price-DESC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.price&order=DESC' . $url)
-            );
-
-            if ($this->config->get('config_review_status')) {
-                $data['sorts'][] = array(
-                    'text'  => $this->language->get('text_rating_desc'),
-                    'value' => 'rating-DESC',
-                    'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=rating&order=DESC' . $url)
-                );
-
-                $data['sorts'][] = array(
-                    'text'  => $this->language->get('text_rating_asc'),
-                    'value' => 'rating-ASC',
-                    'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=rating&order=ASC' . $url)
-                );
-            }
-
-            $data['sorts'][] = array(
-                'text'  => $this->language->get('text_model_asc'),
-                'value' => 'p.model-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.model&order=ASC' . $url)
-            );
-
-            $data['sorts'][] = array(
-                'text'  => $this->language->get('text_model_desc'),
-                'value' => 'p.model-DESC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.model&order=DESC' . $url)
-            );
-
-            $url = '';
-
-            if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
-            }
-
-            if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
-            }
-
-            if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
-            }
-
-            $data['limits'] = array();
-
-            $limits = array_unique(array($this->config->get('config_product_limit'), 25, 50, 75, 100));
-
-            sort($limits);
-
-            foreach ($limits as $value) {
-                $data['limits'][] = array(
-                    'text'  => $value,
-                    'value' => $value,
-                    'href'  => $this->url->link('blog/category', 'path=' . $this->request->get['path'] . $url . '&limit=' . $value)
-                );
-            }
-
-            $url = '';
-
-            if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
-            }
-
-            if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
-            }
-
-            if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
-            }
-
-            if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
-            }
-
-            $pagination = new Pagination();
-            $pagination->total = $post_total;
-            $pagination->page = $page;
-            $pagination->limit = $limit;
-            $pagination->url = $this->url->link('post/category', 'path=' . $this->request->get['path'] . $url . '&page={page}');
-
-            $data['pagination'] = $pagination->render();
-
-            $data['results'] = sprintf($this->language->get('text_pagination'), ($post_total) ? (($page - 1) * $limit) + 1 : 0, ((($page - 1) * $limit) > ($post_total - $limit)) ? $post_total : ((($page - 1) * $limit) + $limit), $post_total, ceil($post_total / $limit));
-
-            $data['sort'] = $sort;
-            $data['order'] = $order;
-            $data['limit'] = $limit;
-
-            $data['continue'] = $this->url->link('common/home');
-
-            $data['column_left'] = $this->load->controller('common/column_left');
-            $data['column_right'] = $this->load->controller('common/column_right');
-            $data['content_top'] = $this->load->controller('common/content_top');
-            $data['content_bottom'] = $this->load->controller('common/content_bottom');
-            $data['footer'] = $this->load->controller('common/footer');
-            $data['header'] = $this->load->controller('common/header');
-
-            if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/blog/category.tpl')) {
-                $this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/blog/category.tpl', $data));
-            } else {
-                $this->response->setOutput($this->load->view('default/template/blog/category.tpl', $data));
-            }
-        } else {
-            $this->load->language('error/not_found');
-
-            $url = '';
+			if (isset($this->request->get['order'])) {
+				$url .= '&order=' . $this->request->get['order'];
+			}
+
+			if (isset($this->request->get['limit'])) {
+				$url .= '&limit=' . $this->request->get['limit'];
+			}
+
+			$data['categories'] = array();
+
+			$results = $this->model_blog_category->getCategories($category_id);
+
+			foreach ($results as $result) {
+				$filter_data = array(
+					'filter_category_id'  => $result['category_id'],
+					'filter_sub_category' => true
+				);
+
+				$image = $this->model_tool_image->resize($result['image'], $this->config->get('config_image_category_width'), $this->config->get('config_image_category_height'));
+
+				$data['categories'][] = array(
+					'name'  => $result['name'] . ($this->config->get('config_product_count') ? ' (' . $this->model_blog_post->getTotalPosts($filter_data) . ')' : ''),
+					'href'  => $this->url->link('blog/category', 'path=' . $this->request->get['path'] . '_' . $result['category_id'] . $url),
+					'thumb' => $image
+				);
+			}
+
+			$data['posts'] = array();
+
+			$filter_data = array(
+				'filter_category_id' => $category_id,
+				'filter_filter'      => $filter,
+				'sort'               => $sort,
+				'order'              => $order,
+				'start'              => ($page - 1) * $limit,
+				'limit'              => $limit
+			);
+
+			$post_total = $this->model_blog_post->getTotalPosts($filter_data);
+
+			$results = $this->model_blog_post->getPosts($filter_data);
+
+			foreach ($results as $result) {
+				$image = '';
+
+				if ($result['image']) {
+					$image = $this->model_tool_image->resize($result['image'], $this->config->get('config_blog_post_list_width'), $this->config->get('config_blog_post_list_height'));
+				}
+
+				$category = $category_info['name'];
+
+				$comment_total = $this->model_blog_comment->getTotalCommentsByPostId($result['post_id']);
+
+				$this->trigger->fire('pre.post.display', array(&$result, 'category'));
+
+				$data['posts'][] = array(
+					'post_id'       => $result['post_id'],
+					'thumb'         => $image,
+					'name'          => $result['name'],
+					'description'   => $result['description'],
+					'category'      => $category,
+					'category_href' => $this->url->link('blog/category', 'path=' . $category_id),
+					'viewed'        => $result['viewed'],
+					'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
+					'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
+					'author'        => $result['author'],
+					'author_href'   => $this->url->link('blog/home', 'filter_author=' . $result['author']),
+					'href'          => $this->url->link('blog/post', 'path=' . $this->request->get['path'] . '&post_id=' . $result['post_id'])
+				);
+			}
+
+			$data['author'] = $this->config->get('config_blog_post_list_author');
+			$data['date_added'] = $this->config->get('config_blog_post_list_date');
+			$data['viewed'] = $this->config->get('config_blog_post_list_read');
+
+			$url = '';
+
+			if (isset($this->request->get['filter'])) {
+				$url .= '&filter=' . urldecode($this->request->get['filter']);
+			}
+
+			if (isset($this->request->get['limit'])) {
+				$url .= '&limit=' . $this->request->get['limit'];
+			}
+
+			$data['sorts'] = array();
+
+			$data['sorts'][] = array(
+				'text'  => $this->language->get('text_default'),
+				'value' => 'p.sort_order-ASC',
+				'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.sort_order&order=ASC' . $url)
+			);
+
+			$data['sorts'][] = array(
+				'text'  => $this->language->get('text_name_asc'),
+				'value' => 'pd.name-ASC',
+				'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=pd.name&order=ASC' . $url)
+			);
+
+			$data['sorts'][] = array(
+				'text'  => $this->language->get('text_name_desc'),
+				'value' => 'pd.name-DESC',
+				'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=pd.name&order=DESC' . $url)
+			);
+
+			$data['sorts'][] = array(
+				'text'  => $this->language->get('text_price_asc'),
+				'value' => 'p.price-ASC',
+				'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.price&order=ASC' . $url)
+			);
+
+			$data['sorts'][] = array(
+				'text'  => $this->language->get('text_price_desc'),
+				'value' => 'p.price-DESC',
+				'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.price&order=DESC' . $url)
+			);
+
+			if ($this->config->get('config_review_status')) {
+				$data['sorts'][] = array(
+					'text'  => $this->language->get('text_rating_desc'),
+					'value' => 'rating-DESC',
+					'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=rating&order=DESC' . $url)
+				);
+
+				$data['sorts'][] = array(
+					'text'  => $this->language->get('text_rating_asc'),
+					'value' => 'rating-ASC',
+					'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=rating&order=ASC' . $url)
+				);
+			}
+
+			$data['sorts'][] = array(
+				'text'  => $this->language->get('text_model_asc'),
+				'value' => 'p.model-ASC',
+				'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.model&order=ASC' . $url)
+			);
+
+			$data['sorts'][] = array(
+				'text'  => $this->language->get('text_model_desc'),
+				'value' => 'p.model-DESC',
+				'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.model&order=DESC' . $url)
+			);
+
+			$url = '';
+
+			if (isset($this->request->get['filter'])) {
+				$url .= '&filter=' . urldecode($this->request->get['filter']);
+			}
+
+			if (isset($this->request->get['sort'])) {
+				$url .= '&sort=' . $this->request->get['sort'];
+			}
+
+			if (isset($this->request->get['order'])) {
+				$url .= '&order=' . $this->request->get['order'];
+			}
+
+			$data['limits'] = array();
+
+			$limits = array_unique(array($this->config->get('config_product_limit'), 25, 50, 75, 100));
+
+			sort($limits);
+
+			foreach ($limits as $value) {
+				$data['limits'][] = array(
+					'text'  => $value,
+					'value' => $value,
+					'href'  => $this->url->link('blog/category', 'path=' . $this->request->get['path'] . $url . '&limit=' . $value)
+				);
+			}
+
+			$url = '';
+
+			if (isset($this->request->get['filter'])) {
+				$url .= '&filter=' . urldecode($this->request->get['filter']);
+			}
+
+			if (isset($this->request->get['sort'])) {
+				$url .= '&sort=' . $this->request->get['sort'];
+			}
+
+			if (isset($this->request->get['order'])) {
+				$url .= '&order=' . $this->request->get['order'];
+			}
+
+			if (isset($this->request->get['limit'])) {
+				$url .= '&limit=' . $this->request->get['limit'];
+			}
+
+			$pagination = new Pagination();
+			$pagination->total = $post_total;
+			$pagination->page = $page;
+			$pagination->limit = $limit;
+			$pagination->url = $this->url->link('post/category', 'path=' . $this->request->get['path'] . $url . '&page={page}');
+
+			$data['pagination'] = $pagination->render();
+
+			$data['results'] = sprintf($this->language->get('text_pagination'), ($post_total) ? (($page - 1) * $limit) + 1 : 0, ((($page - 1) * $limit) > ($post_total - $limit)) ? $post_total : ((($page - 1) * $limit) + $limit), $post_total, ceil($post_total / $limit));
+
+			$data['sort'] = $sort;
+			$data['order'] = $order;
+			$data['limit'] = $limit;
+
+			$data['continue'] = $this->url->link('common/home');
+
+			$data['column_left'] = $this->load->controller('common/column_left');
+			$data['column_right'] = $this->load->controller('common/column_right');
+			$data['content_top'] = $this->load->controller('common/content_top');
+			$data['content_bottom'] = $this->load->controller('common/content_bottom');
+			$data['footer'] = $this->load->controller('common/footer');
+			$data['header'] = $this->load->controller('common/header');
+
+			if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/blog/category.tpl')) {
+				$this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/blog/category.tpl', $data));
+			} else {
+				$this->response->setOutput($this->load->view('default/template/blog/category.tpl', $data));
+			}
+		} else {
+			$this->load->language('error/not_found');
+
+			$url = '';
 
-            if (isset($this->request->get['path'])) {
-                $url .= '&path=' . $this->request->get['path'];
-            }
+			if (isset($this->request->get['path'])) {
+				$url .= '&path=' . $this->request->get['path'];
+			}
 
-            if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
-            }
+			if (isset($this->request->get['filter'])) {
+				$url .= '&filter=' . urldecode($this->request->get['filter']);
+			}
 
-            if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
-            }
+			if (isset($this->request->get['sort'])) {
+				$url .= '&sort=' . $this->request->get['sort'];
+			}
 
-            if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
-            }
+			if (isset($this->request->get['order'])) {
+				$url .= '&order=' . $this->request->get['order'];
+			}
 
-            if (isset($this->request->get['page'])) {
-                $url .= '&page=' . $this->request->get['page'];
-            }
+			if (isset($this->request->get['page'])) {
+				$url .= '&page=' . $this->request->get['page'];
+			}
 
-            if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
-            }
+			if (isset($this->request->get['limit'])) {
+				$url .= '&limit=' . $this->request->get['limit'];
+			}
 
-            if (isset($this->request->get['blogpath'])) {
-                $data['breadcrumbs'][] = array(
-                    'text' => $this->language->get('text_error'),
-                    'href' => $this->url->link('blog/category', $url)
-                );
-            }
+			if (isset($this->request->get['blogpath'])) {
+				$data['breadcrumbs'][] = array(
+					'text' => $this->language->get('text_error'),
+					'href' => $this->url->link('blog/category', $url)
+				);
+			}
 
-            $this->document->setTitle($this->language->get('text_error'));
+			$this->document->setTitle($this->language->get('text_error'));
 
-            $data['heading_title'] = $this->language->get('text_error');
+			$data['heading_title'] = $this->language->get('text_error');
 
-            $data['text_error'] = $this->language->get('text_error');
+			$data['text_error'] = $this->language->get('text_error');
 
-            $data['button_continue'] = $this->language->get('button_continue');
+			$data['button_continue'] = $this->language->get('button_continue');
 
-            $data['continue'] = $this->url->link('common/home');
+			$data['continue'] = $this->url->link('common/home');
 
-            $this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');
+			$this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');
 
-            $data['column_left']    = $this->load->controller('common/column_left');
-            $data['column_right']   = $this->load->controller('common/column_right');
-            $data['content_top']    = $this->load->controller('common/content_top');
-            $data['content_bottom'] = $this->load->controller('common/content_bottom');
-            $data['footer']         = $this->load->controller('common/footer');
-            $data['header']         = $this->load->controller('common/header');
+			$data['column_left']    = $this->load->controller('common/column_left');
+			$data['column_right']   = $this->load->controller('common/column_right');
+			$data['content_top']    = $this->load->controller('common/content_top');
+			$data['content_bottom'] = $this->load->controller('common/content_bottom');
+			$data['footer']         = $this->load->controller('common/footer');
+			$data['header']         = $this->load->controller('common/header');
 
-            if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
-                $this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/error/not_found.tpl', $data));
-            } else {
-                $this->response->setOutput($this->load->view('default/template/error/not_found.tpl', $data));
-            }
-        }
-    }
+			if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
+				$this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/error/not_found.tpl', $data));
+			} else {
+				$this->response->setOutput($this->load->view('default/template/error/not_found.tpl', $data));
+			}
+		}
+	}
 }

Spacing +50 added lines, -50 removed lines

@@ -64,7 +64,7 @@ 
 
         $menu_home = $this->model_blog_post->checkMenu('home');
 
-        $text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog') ;
+        $text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog');
 
         $data['breadcrumbs'][] = array(
             'text' => $this->language->get('text_home'),
@@ -80,15 +80,15 @@ 
             $url = '';
 
             if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
+                $url .= '&sort='.$this->request->get['sort'];
             }
 
             if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
+                $url .= '&order='.$this->request->get['order'];
             }
 
             if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
+                $url .= '&limit='.$this->request->get['limit'];
             }
 
             $path = '';
@@ -101,7 +101,7 @@ 
                 if (!$path) {
                     $path = (int)$path_id;
                 } else {
-                    $path .= '_' . (int)$path_id;
+                    $path .= '_'.(int)$path_id;
                 }
 
                 $category_info = $this->model_blog_category->getCategory($path_id);
@@ -109,7 +109,7 @@ 
                 if ($category_info) {
                     $data['breadcrumbs'][] = array(
                         'text' => $category_info['name'],
-                        'href' => $this->url->link('blog/category', 'path=' . $path . $url)
+                        'href' => $this->url->link('blog/category', 'path='.$path.$url)
                     );
                 }
             }
@@ -126,11 +126,11 @@ 
             $this->document->setDescription($category_info['meta_description']);
             $this->document->setKeywords($category_info['meta_keyword']);
             if (!$this->config->get('config_seo_url')) {
-                $this->document->addLink($this->url->link('blog/category', 'path=' . $this->request->get['path']), 'canonical');
+                $this->document->addLink($this->url->link('blog/category', 'path='.$this->request->get['path']), 'canonical');
             }
 
-            if (is_file(DIR_CATALOG . 'view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css')) {
-                $this->document->addStyle('catalog/view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css');
+            if (is_file(DIR_CATALOG.'view/theme/'.$this->config->get('config_template').'/stylesheet/blog.css')) {
+                $this->document->addStyle('catalog/view/theme/'.$this->config->get('config_template').'/stylesheet/blog.css');
             } else {
                 $this->document->addStyle('catalog/view/theme/default/stylesheet/blog.css');
             }
@@ -140,7 +140,7 @@ 
             // Set the last category breadcrumb
             $data['breadcrumbs'][] = array(
                 'text' => $category_info['name'],
-                'href' => $this->url->link('blog/category', 'path=' . $this->request->get['path'])
+                'href' => $this->url->link('blog/category', 'path='.$this->request->get['path'])
             );
 
             $data['thumb'] = '';
@@ -159,19 +159,19 @@ 
             $url = '';
 
             if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
+                $url .= '&filter='.urldecode($this->request->get['filter']);
             }
 
             if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
+                $url .= '&sort='.$this->request->get['sort'];
             }
 
             if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
+                $url .= '&order='.$this->request->get['order'];
             }
 
             if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
+                $url .= '&limit='.$this->request->get['limit'];
             }
 
             $data['categories'] = array();
@@ -187,8 +187,8 @@ 
                 $image = $this->model_tool_image->resize($result['image'], $this->config->get('config_image_category_width'), $this->config->get('config_image_category_height'));
 
                 $data['categories'][] = array(
-                    'name'  => $result['name'] . ($this->config->get('config_product_count') ? ' (' . $this->model_blog_post->getTotalPosts($filter_data) . ')' : ''),
-                    'href'  => $this->url->link('blog/category', 'path=' . $this->request->get['path'] . '_' . $result['category_id'] . $url),
+                    'name'  => $result['name'].($this->config->get('config_product_count') ? ' ('.$this->model_blog_post->getTotalPosts($filter_data).')' : ''),
+                    'href'  => $this->url->link('blog/category', 'path='.$this->request->get['path'].'_'.$result['category_id'].$url),
                     'thumb' => $image
                 );
             }
@@ -227,13 +227,13 @@ 
                     'name'          => $result['name'],
                     'description'   => $result['description'],
                     'category'      => $category,
-                    'category_href' => $this->url->link('blog/category', 'path=' . $category_id),
+                    'category_href' => $this->url->link('blog/category', 'path='.$category_id),
                     'viewed'        => $result['viewed'],
                     'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
                     'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
                     'author'        => $result['author'],
-                    'author_href'   => $this->url->link('blog/home', 'filter_author=' . $result['author']),
-                    'href'          => $this->url->link('blog/post', 'path=' . $this->request->get['path'] . '&post_id=' . $result['post_id'])
+                    'author_href'   => $this->url->link('blog/home', 'filter_author='.$result['author']),
+                    'href'          => $this->url->link('blog/post', 'path='.$this->request->get['path'].'&post_id='.$result['post_id'])
                 );
             }
 
@@ -244,11 +244,11 @@ 
             $url = '';
 
             if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
+                $url .= '&filter='.urldecode($this->request->get['filter']);
             }
 
             if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
+                $url .= '&limit='.$this->request->get['limit'];
             }
 
             $data['sorts'] = array();
@@ -256,71 +256,71 @@ 
             $data['sorts'][] = array(
                 'text'  => $this->language->get('text_default'),
                 'value' => 'p.sort_order-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.sort_order&order=ASC' . $url)
+                'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=p.sort_order&order=ASC'.$url)
             );
 
             $data['sorts'][] = array(
                 'text'  => $this->language->get('text_name_asc'),
                 'value' => 'pd.name-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=pd.name&order=ASC' . $url)
+                'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=pd.name&order=ASC'.$url)
             );
 
             $data['sorts'][] = array(
                 'text'  => $this->language->get('text_name_desc'),
                 'value' => 'pd.name-DESC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=pd.name&order=DESC' . $url)
+                'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=pd.name&order=DESC'.$url)
             );
 
             $data['sorts'][] = array(
                 'text'  => $this->language->get('text_price_asc'),
                 'value' => 'p.price-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.price&order=ASC' . $url)
+                'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=p.price&order=ASC'.$url)
             );
 
             $data['sorts'][] = array(
                 'text'  => $this->language->get('text_price_desc'),
                 'value' => 'p.price-DESC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.price&order=DESC' . $url)
+                'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=p.price&order=DESC'.$url)
             );
 
             if ($this->config->get('config_review_status')) {
                 $data['sorts'][] = array(
                     'text'  => $this->language->get('text_rating_desc'),
                     'value' => 'rating-DESC',
-                    'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=rating&order=DESC' . $url)
+                    'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=rating&order=DESC'.$url)
                 );
 
                 $data['sorts'][] = array(
                     'text'  => $this->language->get('text_rating_asc'),
                     'value' => 'rating-ASC',
-                    'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=rating&order=ASC' . $url)
+                    'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=rating&order=ASC'.$url)
                 );
             }
 
             $data['sorts'][] = array(
                 'text'  => $this->language->get('text_model_asc'),
                 'value' => 'p.model-ASC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.model&order=ASC' . $url)
+                'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=p.model&order=ASC'.$url)
             );
 
             $data['sorts'][] = array(
                 'text'  => $this->language->get('text_model_desc'),
                 'value' => 'p.model-DESC',
-                'href'  => $this->url->link('post/category', 'path=' . $this->request->get['path'] . '&sort=p.model&order=DESC' . $url)
+                'href'  => $this->url->link('post/category', 'path='.$this->request->get['path'].'&sort=p.model&order=DESC'.$url)
             );
 
             $url = '';
 
             if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
+                $url .= '&filter='.urldecode($this->request->get['filter']);
             }
 
             if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
+                $url .= '&sort='.$this->request->get['sort'];
             }
 
             if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
+                $url .= '&order='.$this->request->get['order'];
             }
 
             $data['limits'] = array();
@@ -333,33 +333,33 @@ 
                 $data['limits'][] = array(
                     'text'  => $value,
                     'value' => $value,
-                    'href'  => $this->url->link('blog/category', 'path=' . $this->request->get['path'] . $url . '&limit=' . $value)
+                    'href'  => $this->url->link('blog/category', 'path='.$this->request->get['path'].$url.'&limit='.$value)
                 );
             }
 
             $url = '';
 
             if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
+                $url .= '&filter='.urldecode($this->request->get['filter']);
             }
 
             if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
+                $url .= '&sort='.$this->request->get['sort'];
             }
 
             if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
+                $url .= '&order='.$this->request->get['order'];
             }
 
             if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
+                $url .= '&limit='.$this->request->get['limit'];
             }
 
             $pagination = new Pagination();
             $pagination->total = $post_total;
             $pagination->page = $page;
             $pagination->limit = $limit;
-            $pagination->url = $this->url->link('post/category', 'path=' . $this->request->get['path'] . $url . '&page={page}');
+            $pagination->url = $this->url->link('post/category', 'path='.$this->request->get['path'].$url.'&page={page}');
 
             $data['pagination'] = $pagination->render();
 
@@ -378,8 +378,8 @@ 
             $data['footer'] = $this->load->controller('common/footer');
             $data['header'] = $this->load->controller('common/header');
 
-            if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/blog/category.tpl')) {
-                $this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/blog/category.tpl', $data));
+            if (file_exists(DIR_TEMPLATE.$this->config->get('config_template').'/template/blog/category.tpl')) {
+                $this->response->setOutput($this->load->view($this->config->get('config_template').'/template/blog/category.tpl', $data));
             } else {
                 $this->response->setOutput($this->load->view('default/template/blog/category.tpl', $data));
             }
@@ -389,27 +389,27 @@ 
             $url = '';
 
             if (isset($this->request->get['path'])) {
-                $url .= '&path=' . $this->request->get['path'];
+                $url .= '&path='.$this->request->get['path'];
             }
 
             if (isset($this->request->get['filter'])) {
-                $url .= '&filter=' . urldecode($this->request->get['filter']);
+                $url .= '&filter='.urldecode($this->request->get['filter']);
             }
 
             if (isset($this->request->get['sort'])) {
-                $url .= '&sort=' . $this->request->get['sort'];
+                $url .= '&sort='.$this->request->get['sort'];
             }
 
             if (isset($this->request->get['order'])) {
-                $url .= '&order=' . $this->request->get['order'];
+                $url .= '&order='.$this->request->get['order'];
             }
 
             if (isset($this->request->get['page'])) {
-                $url .= '&page=' . $this->request->get['page'];
+                $url .= '&page='.$this->request->get['page'];
             }
 
             if (isset($this->request->get['limit'])) {
-                $url .= '&limit=' . $this->request->get['limit'];
+                $url .= '&limit='.$this->request->get['limit'];
             }
 
             if (isset($this->request->get['blogpath'])) {
@@ -429,7 +429,7 @@ 
 
             $data['continue'] = $this->url->link('common/home');
 
-            $this->response->addHeader($this->request->server['SERVER_PROTOCOL'] . ' 404 Not Found');
+            $this->response->addHeader($this->request->server['SERVER_PROTOCOL'].' 404 Not Found');
 
             $data['column_left']    = $this->load->controller('common/column_left');
             $data['column_right']   = $this->load->controller('common/column_right');
@@ -438,8 +438,8 @@ 
             $data['footer']         = $this->load->controller('common/footer');
             $data['header']         = $this->load->controller('common/header');
 
-            if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/error/not_found.tpl')) {
-                $this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/error/not_found.tpl', $data));
+            if (file_exists(DIR_TEMPLATE.$this->config->get('config_template').'/template/error/not_found.tpl')) {
+                $this->response->setOutput($this->load->view($this->config->get('config_template').'/template/error/not_found.tpl', $data));
             } else {
                 $this->response->setOutput($this->load->view('default/template/error/not_found.tpl', $data));
             }

catalog/controller/blog/home.php

Indentation +156 added lines, -156 removed lines

@@ -9,197 +9,197 @@
 
 class ControllerBlogHome extends Controller
 {
-    private $error = array();
+	private $error = array();
 
-    public function index()
-    {
-        $this->load->language('blog/home');
+	public function index()
+	{
+		$this->load->language('blog/home');
 
-        $this->load->model('blog/post');
-        $this->load->model('blog/comment');
+		$this->load->model('blog/post');
+		$this->load->model('blog/comment');
 
-        $this->load->model('tool/image');
+		$this->load->model('tool/image');
 
-        #Get All Language Text
-        $data = $this->language->all();
+		#Get All Language Text
+		$data = $this->language->all();
 
-        $data['breadcrumbs'] = array();
+		$data['breadcrumbs'] = array();
 
-        $menu_home = $this->model_blog_post->checkMenu('home');
+		$menu_home = $this->model_blog_post->checkMenu('home');
 
-        $text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog') ;
+		$text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog') ;
 
-        $data['breadcrumbs'][] = array(
-            'text' => $this->language->get('text_home'),
-            'href' => $this->url->link('common/home')
-        );
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/home')
+		);
 
-        $data['breadcrumbs'][] = array(
-            'text' => $text_home,
-            'href' => $this->url->link('blog/home')
-        );
+		$data['breadcrumbs'][] = array(
+			'text' => $text_home,
+			'href' => $this->url->link('blog/home')
+		);
 
-        $filter_author = false;
+		$filter_author = false;
 
-        if (isset($this->request->get['filter_author'])) {
-            $filter_author = $this->request->get['filter_author'];
-        }
+		if (isset($this->request->get['filter_author'])) {
+			$filter_author = $this->request->get['filter_author'];
+		}
 
-        $filter_tag= false;
+		$filter_tag= false;
 
-        if (isset($this->request->get['tag'])) {
-            $filter_tag = $this->request->get['tag'];
-        }
+		if (isset($this->request->get['tag'])) {
+			$filter_tag = $this->request->get['tag'];
+		}
 
-        $page = 1;
+		$page = 1;
 
-        if (isset($this->request->get['page'])) {
-            $page = $this->request->get['page'];
-        }
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		}
 
-        $limit = $this->config->get('config_blog_post_list_limit');
+		$limit = $this->config->get('config_blog_post_list_limit');
 
-        $data['posts'] = array();
-        $data['featured_posts'] = array();
+		$data['posts'] = array();
+		$data['featured_posts'] = array();
 
-        $results = $this->model_blog_post->getFeaturedPosts();
+		$results = $this->model_blog_post->getFeaturedPosts();
 
-        foreach ($results as $result) {
-            $image = '';
+		foreach ($results as $result) {
+			$image = '';
 
-            if ($result['image']) {
-                $image = $this->model_tool_image->resize($result['image'], $this->config->get('config_blog_post_list_width'), $this->config->get('config_blog_post_list_height'));
-            }
+			if ($result['image']) {
+				$image = $this->model_tool_image->resize($result['image'], $this->config->get('config_blog_post_list_width'), $this->config->get('config_blog_post_list_height'));
+			}
 
-            $category = $this->model_blog_post->getPostCategory($result['post_id']);
+			$category = $this->model_blog_post->getPostCategory($result['post_id']);
 
-            $comment_total = $this->model_blog_comment->getTotalCommentsByPostId($result['post_id']);
+			$comment_total = $this->model_blog_comment->getTotalCommentsByPostId($result['post_id']);
 
-            $this->trigger->fire('pre.post.display', array(&$result, 'home'));
+			$this->trigger->fire('pre.post.display', array(&$result, 'home'));
 
-            $data['featured_posts'][] = array(
-                'post_id'       => $result['post_id'],
-                'thumb'         => $image,
-                'name'          => $result['name'],
-                'description'   => $result['description'],
-                'category'      => $category['name'],
-                'category_href' => $this->url->link('blog/category', 'path=' . $category['category_id']),
-                'viewed'        => $result['viewed'],
-                'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
-                'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
-                'author'        => $result['author'],
-                'author_href'   => $this->url->link('blog/home', 'filter_author=' . rawurlencode($result['author'])),
-                'href'          => $this->url->link('blog/post', 'post_id=' . $result['post_id'])
-            );
-        }
+			$data['featured_posts'][] = array(
+				'post_id'       => $result['post_id'],
+				'thumb'         => $image,
+				'name'          => $result['name'],
+				'description'   => $result['description'],
+				'category'      => $category['name'],
+				'category_href' => $this->url->link('blog/category', 'path=' . $category['category_id']),
+				'viewed'        => $result['viewed'],
+				'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
+				'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
+				'author'        => $result['author'],
+				'author_href'   => $this->url->link('blog/home', 'filter_author=' . rawurlencode($result['author'])),
+				'href'          => $this->url->link('blog/post', 'post_id=' . $result['post_id'])
+			);
+		}
 
-        $filter_data = array(
-            'filter_featured' => '0',
-            'filter_author'   => $filter_author,
-            'filter_tag'      => $filter_tag,
-            'start'           => ($page - 1) * $limit,
-            'limit'           => $limit
-        );
+		$filter_data = array(
+			'filter_featured' => '0',
+			'filter_author'   => $filter_author,
+			'filter_tag'      => $filter_tag,
+			'start'           => ($page - 1) * $limit,
+			'limit'           => $limit
+		);
 
-        $post_total = $this->model_blog_post->getTotalPosts($filter_data);
+		$post_total = $this->model_blog_post->getTotalPosts($filter_data);
 
-        $results = $this->model_blog_post->getPosts($filter_data);
+		$results = $this->model_blog_post->getPosts($filter_data);
 
-        foreach ($results as $result) {
-            $image = '';
+		foreach ($results as $result) {
+			$image = '';
 
-            if ($result['image']) {
-                $image = $this->model_tool_image->resize($result['image'], $this->config->get('config_blog_post_list_width'), $this->config->get('config_blog_post_list_height'));
-            }
+			if ($result['image']) {
+				$image = $this->model_tool_image->resize($result['image'], $this->config->get('config_blog_post_list_width'), $this->config->get('config_blog_post_list_height'));
+			}
 
-            $category = $this->model_blog_post->getPostCategory($result['post_id']);
+			$category = $this->model_blog_post->getPostCategory($result['post_id']);
 
-            $comment_total = $this->model_blog_comment->getTotalCommentsByPostId($result['post_id']);
+			$comment_total = $this->model_blog_comment->getTotalCommentsByPostId($result['post_id']);
 
-            $this->trigger->fire('pre.post.display', array(&$result, 'home'));
+			$this->trigger->fire('pre.post.display', array(&$result, 'home'));
 
-            $data['posts'][] = array(
-                'post_id'       => $result['post_id'],
-                'thumb'         => $image,
-                'name'          => $result['name'],
-                'description'   => $result['description'],
-                'category'      => $category['name'],
-                'category_href' => $this->url->link('blog/category', 'path=' . $category['category_id']),
-                'viewed'        => $result['viewed'],
-                'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
-                'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
-                'author'        => $result['author'],
-                'author_href'   => $this->url->link('blog/home', 'filter_author=' . rawurlencode($result['author'])),
-                'href'          => $this->url->link('blog/post', 'post_id=' . $result['post_id'])
-            );
-        }
+			$data['posts'][] = array(
+				'post_id'       => $result['post_id'],
+				'thumb'         => $image,
+				'name'          => $result['name'],
+				'description'   => $result['description'],
+				'category'      => $category['name'],
+				'category_href' => $this->url->link('blog/category', 'path=' . $category['category_id']),
+				'viewed'        => $result['viewed'],
+				'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
+				'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
+				'author'        => $result['author'],
+				'author_href'   => $this->url->link('blog/home', 'filter_author=' . rawurlencode($result['author'])),
+				'href'          => $this->url->link('blog/post', 'post_id=' . $result['post_id'])
+			);
+		}
 
-        $data['author'] = $this->config->get('config_blog_post_list_author');
-        $data['category'] = $this->config->get('config_blog_post_list_category', 1);
-        $data['date_added'] = $this->config->get('config_blog_post_list_date');
-        $data['viewed'] = $this->config->get('config_blog_post_list_read');
+		$data['author'] = $this->config->get('config_blog_post_list_author');
+		$data['category'] = $this->config->get('config_blog_post_list_category', 1);
+		$data['date_added'] = $this->config->get('config_blog_post_list_date');
+		$data['viewed'] = $this->config->get('config_blog_post_list_read');
 
-        $data['heading_title'] = $this->config->get('config_blog_name');
+		$data['heading_title'] = $this->config->get('config_blog_name');
 
-        $title = ($this->config->get('config_blog_meta_title')) ? $this->config->get('config_blog_meta_title') : $this->config->get('config_blog_name');
-
-        $data['description'] = html_entity_decode($this->config->get('config_blog_description'), ENT_QUOTES, 'UTF-8');
+		$title = ($this->config->get('config_blog_meta_title')) ? $this->config->get('config_blog_meta_title') : $this->config->get('config_blog_name');
+
+		$data['description'] = html_entity_decode($this->config->get('config_blog_description'), ENT_QUOTES, 'UTF-8');
 
-        $this->document->setTitle($title);
-        $this->document->setDescription($this->config->get('config_blog_meta_description'));
-        $this->document->setKeywords($this->config->get('config_blog_meta_keyword'));
-        if (!$this->config->get('config_seo_url')) {
-            $this->document->addLink($this->url->link('blog/home'), 'canonical');
-        }
-
-        $this->document->addStyle('catalog/view/javascript/jquery/owl-carousel/owl.carousel.css');
-        $this->document->addStyle('catalog/view/javascript/jquery/owl-carousel/owl.transitions.css');
-        $this->document->addScript('catalog/view/javascript/jquery/owl-carousel/owl.carousel.min.js');
-
-        if (is_file(DIR_CATALOG . 'view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css')) {
-            $this->document->addStyle('catalog/view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css');
-        } else {
-            $this->document->addStyle('catalog/view/theme/default/stylesheet/blog.css');
-        }
-
-        $data['description'] = html_entity_decode($this->config->get('config_blog_description'), ENT_QUOTES, 'UTF-8');
-
-        $data['date_added_status']     = $this->config->get('blogsetting_date_added');
-        $data['comments_count_status'] = $this->config->get('blogsetting_comments_count');
-        $data['page_view_status']      = $this->config->get('blogsetting_page_view');
-        $data['author_status']         = $this->config->get('blogsetting_author');
-        $data['list_columns']          = $this->config->get('blogsetting_layout');
-
-        $data['continue'] = $this->url->link('common/home');
-
-        $url = '';
-
-        if (isset($this->request->get['page'])) {
-            $url .= '&page=' . $this->request->get['page'];
-        }
-
-        $pagination        = new Pagination();
-        $pagination->total = $post_total;
-        $pagination->page  = $page;
-        $pagination->limit = $limit;
-        $pagination->text  = $this->language->get('text_pagination');
-        $pagination->url   = $this->url->link('blog/home', $url . '&page={page}');
-
-        $data['pagination'] = $pagination->render();
-
-        $data['results'] = sprintf($this->language->get('text_pagination'), ($post_total) ? (($page - 1) * $limit) + 1 : 0, ((($page - 1) * $limit) > ($post_total - $limit)) ? $post_total : ((($page - 1) * $limit) + $limit), $post_total, ceil($post_total / $limit));
-
-        $data['column_left']    = $this->load->controller('common/column_left');
-        $data['column_right']   = $this->load->controller('common/column_right');
-        $data['content_top']    = $this->load->controller('common/content_top');
-        $data['content_bottom'] = $this->load->controller('common/content_bottom');
-        $data['footer']         = $this->load->controller('common/footer');
-        $data['header']         = $this->load->controller('common/header');
-
-        if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/blog/home.tpl')) {
-            $this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/blog/home.tpl', $data));
-        } else {
-            $this->response->setOutput($this->load->view('default/template/blog/home.tpl', $data));
-        }
-    }
+		$this->document->setTitle($title);
+		$this->document->setDescription($this->config->get('config_blog_meta_description'));
+		$this->document->setKeywords($this->config->get('config_blog_meta_keyword'));
+		if (!$this->config->get('config_seo_url')) {
+			$this->document->addLink($this->url->link('blog/home'), 'canonical');
+		}
+
+		$this->document->addStyle('catalog/view/javascript/jquery/owl-carousel/owl.carousel.css');
+		$this->document->addStyle('catalog/view/javascript/jquery/owl-carousel/owl.transitions.css');
+		$this->document->addScript('catalog/view/javascript/jquery/owl-carousel/owl.carousel.min.js');
+
+		if (is_file(DIR_CATALOG . 'view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css')) {
+			$this->document->addStyle('catalog/view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css');
+		} else {
+			$this->document->addStyle('catalog/view/theme/default/stylesheet/blog.css');
+		}
+
+		$data['description'] = html_entity_decode($this->config->get('config_blog_description'), ENT_QUOTES, 'UTF-8');
+
+		$data['date_added_status']     = $this->config->get('blogsetting_date_added');
+		$data['comments_count_status'] = $this->config->get('blogsetting_comments_count');
+		$data['page_view_status']      = $this->config->get('blogsetting_page_view');
+		$data['author_status']         = $this->config->get('blogsetting_author');
+		$data['list_columns']          = $this->config->get('blogsetting_layout');
+
+		$data['continue'] = $this->url->link('common/home');
+
+		$url = '';
+
+		if (isset($this->request->get['page'])) {
+			$url .= '&page=' . $this->request->get['page'];
+		}
+
+		$pagination        = new Pagination();
+		$pagination->total = $post_total;
+		$pagination->page  = $page;
+		$pagination->limit = $limit;
+		$pagination->text  = $this->language->get('text_pagination');
+		$pagination->url   = $this->url->link('blog/home', $url . '&page={page}');
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($post_total) ? (($page - 1) * $limit) + 1 : 0, ((($page - 1) * $limit) > ($post_total - $limit)) ? $post_total : ((($page - 1) * $limit) + $limit), $post_total, ceil($post_total / $limit));
+
+		$data['column_left']    = $this->load->controller('common/column_left');
+		$data['column_right']   = $this->load->controller('common/column_right');
+		$data['content_top']    = $this->load->controller('common/content_top');
+		$data['content_bottom'] = $this->load->controller('common/content_bottom');
+		$data['footer']         = $this->load->controller('common/footer');
+		$data['header']         = $this->load->controller('common/header');
+
+		if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/blog/home.tpl')) {
+			$this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/blog/home.tpl', $data));
+		} else {
+			$this->response->setOutput($this->load->view('default/template/blog/home.tpl', $data));
+		}
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
 
         $menu_home = $this->model_blog_post->checkMenu('home');
 
-        $text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog') ;
+        $text_home = ($menu_home) ? $menu_home : $this->language->get('text_blog');
 
         $data['breadcrumbs'][] = array(
             'text' => $this->language->get('text_home'),
@@ -45,7 +45,7 @@ 
             $filter_author = $this->request->get['filter_author'];
         }
 
-        $filter_tag= false;
+        $filter_tag = false;
 
         if (isset($this->request->get['tag'])) {
             $filter_tag = $this->request->get['tag'];
@@ -83,13 +83,13 @@ 
                 'name'          => $result['name'],
                 'description'   => $result['description'],
                 'category'      => $category['name'],
-                'category_href' => $this->url->link('blog/category', 'path=' . $category['category_id']),
+                'category_href' => $this->url->link('blog/category', 'path='.$category['category_id']),
                 'viewed'        => $result['viewed'],
                 'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
                 'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
                 'author'        => $result['author'],
-                'author_href'   => $this->url->link('blog/home', 'filter_author=' . rawurlencode($result['author'])),
-                'href'          => $this->url->link('blog/post', 'post_id=' . $result['post_id'])
+                'author_href'   => $this->url->link('blog/home', 'filter_author='.rawurlencode($result['author'])),
+                'href'          => $this->url->link('blog/post', 'post_id='.$result['post_id'])
             );
         }
 
@@ -124,13 +124,13 @@ 
                 'name'          => $result['name'],
                 'description'   => $result['description'],
                 'category'      => $category['name'],
-                'category_href' => $this->url->link('blog/category', 'path=' . $category['category_id']),
+                'category_href' => $this->url->link('blog/category', 'path='.$category['category_id']),
                 'viewed'        => $result['viewed'],
                 'comment_total' => sprintf((($comment_total > 1) ? $this->language->get('text_comment_totals') : $this->language->get('text_comment_total')), $comment_total),
                 'date_added'    => date($this->language->get('date_format_short'), strtotime($result['date_available'])),
                 'author'        => $result['author'],
-                'author_href'   => $this->url->link('blog/home', 'filter_author=' . rawurlencode($result['author'])),
-                'href'          => $this->url->link('blog/post', 'post_id=' . $result['post_id'])
+                'author_href'   => $this->url->link('blog/home', 'filter_author='.rawurlencode($result['author'])),
+                'href'          => $this->url->link('blog/post', 'post_id='.$result['post_id'])
             );
         }
 
@@ -156,8 +156,8 @@ 
         $this->document->addStyle('catalog/view/javascript/jquery/owl-carousel/owl.transitions.css');
         $this->document->addScript('catalog/view/javascript/jquery/owl-carousel/owl.carousel.min.js');
 
-        if (is_file(DIR_CATALOG . 'view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css')) {
-            $this->document->addStyle('catalog/view/theme/' . $this->config->get('config_template') . '/stylesheet/blog.css');
+        if (is_file(DIR_CATALOG.'view/theme/'.$this->config->get('config_template').'/stylesheet/blog.css')) {
+            $this->document->addStyle('catalog/view/theme/'.$this->config->get('config_template').'/stylesheet/blog.css');
         } else {
             $this->document->addStyle('catalog/view/theme/default/stylesheet/blog.css');
         }
@@ -175,7 +175,7 @@ 
         $url = '';
 
         if (isset($this->request->get['page'])) {
-            $url .= '&page=' . $this->request->get['page'];
+            $url .= '&page='.$this->request->get['page'];
         }
 
         $pagination        = new Pagination();
@@ -183,7 +183,7 @@ 
         $pagination->page  = $page;
         $pagination->limit = $limit;
         $pagination->text  = $this->language->get('text_pagination');
-        $pagination->url   = $this->url->link('blog/home', $url . '&page={page}');
+        $pagination->url   = $this->url->link('blog/home', $url.'&page={page}');
 
         $data['pagination'] = $pagination->render();
 
@@ -196,8 +196,8 @@ 
         $data['footer']         = $this->load->controller('common/footer');
         $data['header']         = $this->load->controller('common/header');
 
-        if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/blog/home.tpl')) {
-            $this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/blog/home.tpl', $data));
+        if (file_exists(DIR_TEMPLATE.$this->config->get('config_template').'/template/blog/home.tpl')) {
+            $this->response->setOutput($this->load->view($this->config->get('config_template').'/template/blog/home.tpl', $data));
         } else {
             $this->response->setOutput($this->load->view('default/template/blog/home.tpl', $data));
         }